func name change

This commit is contained in:
Jeff Carr 2025-01-30 11:50:23 -06:00
parent ff91deee63
commit c079039ffe
1 changed files with 2 additions and 2 deletions

View File

@ -58,7 +58,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 result, err := rs.pb.MergeDevelToMaster(); err == nil {
if result, err := rs.pb.MergeToMaster(); err == nil {
log.Warn("THINGS SEEM OK fullAutomation() returned true.")
} else {
log.Warn("THINGS FAILED fullAutomation() returned false", result.Error)
@ -113,7 +113,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
rs.releaseVersion = newgrid.NewButton("tag and release new version", func() {
rs.Disable()
rs.pb.MergeDevelToMaster()
rs.pb.MergeToMaster()
})
// rs.releaseVersion.Hide()
newgrid.NextRow()