From f82743d487dccd5ee3154e5e95f03f1f1427cc98 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 16 Feb 2024 21:20:52 -0600 Subject: redo the merge code --- modifyBox.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modifyBox.go') diff --git a/modifyBox.go b/modifyBox.go index 4df7886..960ed8d 100644 --- a/modifyBox.go +++ b/modifyBox.go @@ -50,7 +50,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) { label := "merge " + rs.userWorkingName.String() + " to " + rs.develWorkingName.String() rs.develMergeB = newgrid.NewButton(label, func() { rs.Disable() - if rs.RunDevelMergeB() { + if rs.MergeUserToDevel() { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { log.Warn("THINGS FAILED fullAutomation() returned false") @@ -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.RunDevelMergeB() { + if rs.MergeUserToDevel() { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { log.Warn("THINGS FAILED fullAutomation() returned false") -- cgit v1.2.3