diff options
| author | Jeff Carr <[email protected]> | 2025-01-30 11:27:37 -0600 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-01-30 11:27:37 -0600 |
| commit | ff91deee63703ab3d8574bc923d8ac89d6ff81d0 (patch) | |
| tree | a97e26766f0a3135c9be70e6492f4e1c1265e725 | |
| parent | 2395a4466e9c08112372c480b30ac0823eeeb549 (diff) | |
func name change
| -rw-r--r-- | modifyBox.go | 2 |
1 files changed, 1 insertions, 1 deletions
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) |