func name change

This commit is contained in:
Jeff Carr 2025-01-30 11:27:37 -06:00
parent 2395a4466e
commit ff91deee63
1 changed files with 1 additions and 1 deletions

View File

@ -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)