From 45519f2370aa00243f823ef949b1f7d4fb359cb2 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 16 Feb 2024 21:41:15 -0600 Subject: drat Signed-off-by: Jeff Carr --- modifyBox.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modifyBox.go b/modifyBox.go index d49f967..502727f 100644 --- a/modifyBox.go +++ b/modifyBox.go @@ -61,7 +61,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) { label = "merge " + rs.develWorkingName.String() + " to " + rs.mainWorkingName.String() rs.mainMergeB = newgrid.NewButton(label, func() { rs.Disable() - if rs.MergeUserToDevel() { + if rs.MergeDevelToMaster() { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { log.Warn("THINGS FAILED fullAutomation() returned false") -- cgit v1.2.3