diff options
Diffstat (limited to 'modifyBox.go')
| -rw-r--r-- | modifyBox.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modifyBox.go b/modifyBox.go index 42b26b0..10c04f8 100644 --- a/modifyBox.go +++ b/modifyBox.go @@ -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() |