diff options
| author | Jeff Carr <[email protected]> | 2024-02-16 21:41:15 -0600 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2024-02-16 21:41:15 -0600 |
| commit | 45519f2370aa00243f823ef949b1f7d4fb359cb2 (patch) | |
| tree | 69405dc3523a23de234bf357e1e365bef4a19c46 /modifyBox.go | |
| parent | 6e7759f570bcee0cb812d6940f66e1d9540de32a (diff) | |
drat
Signed-off-by: Jeff Carr <[email protected]>
Diffstat (limited to 'modifyBox.go')
| -rw-r--r-- | modifyBox.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modifyBox.go b/modifyBox.go index d49f967..502727f 100644 --- a/modifyBox.go +++ b/modifyBox.go @@ -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.MergeUserToDevel() { + if rs.MergeDevelToMaster() { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { log.Warn("THINGS FAILED fullAutomation() returned false") |