diff options
| author | Jeff Carr <[email protected]> | 2024-02-16 21:20:52 -0600 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2024-02-16 21:20:52 -0600 |
| commit | f82743d487dccd5ee3154e5e95f03f1f1427cc98 (patch) | |
| tree | 6e0199d7e405c06beddfa807e1c69da2dba70b2b /modifyBox.go | |
| parent | c7aaea4ae117b95a894b775bf8ef2e661db6f0ea (diff) | |
redo the merge code
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 4df7886..960ed8d 100644 --- a/modifyBox.go +++ b/modifyBox.go @@ -50,7 +50,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 rs.RunDevelMergeB() { + if rs.MergeUserToDevel() { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { log.Warn("THINGS FAILED fullAutomation() returned false") @@ -61,7 +61,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 rs.RunDevelMergeB() { + if rs.MergeUserToDevel() { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { log.Warn("THINGS FAILED fullAutomation() returned false") |