diff options
| author | Jeff Carr <[email protected]> | 2025-01-05 12:01:39 -0600 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-01-05 12:01:39 -0600 |
| commit | 05d827868e242174815f8061e9ed3f0738f925f5 (patch) | |
| tree | 8823d2abeeab4dbde308a743df8a78f7a6ee0789 /modifyBox.go | |
| parent | 3a53e0bd9b893c2e5aee472baae2cc92c6b42afe (diff) | |
move merge code to gitpbv0.22.31
Diffstat (limited to 'modifyBox.go')
| -rw-r--r-- | modifyBox.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modifyBox.go b/modifyBox.go index 644fcda..6003fae 100644 --- a/modifyBox.go +++ b/modifyBox.go @@ -47,10 +47,10 @@ 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 rs.MergeUserToDevel() { + if result, err := rs.pb.MergeUserToDevel(); err == nil { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { - log.Warn("THINGS FAILED fullAutomation() returned false") + log.Warn("THINGS FAILED fullAutomation() returned false", result.Error) } rs.Enable() }) @@ -58,10 +58,10 @@ 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 rs.MergeDevelToMaster() { + if result, err := rs.pb.MergeDevelToMaster(); err == nil { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { - log.Warn("THINGS FAILED fullAutomation() returned false") + log.Warn("THINGS FAILED fullAutomation() returned false", result.Error) } rs.Enable() }) @@ -112,7 +112,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) { rs.releaseVersion = newgrid.NewButton("tag and release new version", func() { rs.Disable() - rs.MergeDevelToMaster() + rs.pb.MergeDevelToMaster() }) // rs.releaseVersion.Hide() newgrid.NextRow() |