diff options
Diffstat (limited to 'doGui.go')
| -rw-r--r-- | doGui.go | 27 |
1 files changed, 27 insertions, 0 deletions
@@ -243,6 +243,33 @@ func drawWindow(win *gadgets.BasicWindow) { mergeDevelToMaster(me.autoCreateBranches.Checked()) }) + + grid.NewButton("merge all", func() { + win.Disable() + defer win.Enable() + + me.argvCheckoutUser = false + me.argvCheckoutDevel = true + me.argvCheckoutMaster = false + if err := doCheckoutShared(); err != nil { + log.Info("checkout error:", err) + } else { + log.Info("checkout was ok") + } + + mergeDevelToMaster(me.autoCreateBranches.Checked()) + + me.argvCheckoutUser = false + me.argvCheckoutDevel = false + me.argvCheckoutMaster = true + if err := doCheckoutShared(); err != nil { + log.Info("checkout error:", err) + } else { + log.Info("checkout was ok") + } + + mergeDevelToMaster(me.autoCreateBranches.Checked()) + }) } func findMergeToDevel() { |
