From ff91deee63703ab3d8574bc923d8ac89d6ff81d0 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 30 Jan 2025 11:27:37 -0600 Subject: [PATCH] func name change --- modifyBox.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modifyBox.go b/modifyBox.go index 4490514..42b26b0 100644 --- a/modifyBox.go +++ b/modifyBox.go @@ -47,7 +47,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 result, err := rs.pb.MergeUserToDevel(); err == nil { + if result, err := rs.pb.MergeToDevel(); err == nil { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { log.Warn("THINGS FAILED fullAutomation() returned false", result.Error)