summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doGui.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/doGui.go b/doGui.go
index 6ab9420..203b555 100644
--- a/doGui.go
+++ b/doGui.go
@@ -254,6 +254,14 @@ func drawWindow(win *gadgets.BasicWindow) {
// log.Info(strings.Join(r.Stderr, "\n"))
return
}
+ if repo.CheckoutMaster() {
+ log.Info("checkout master failed", repo.GetGoPath())
+ return
+ }
+ if _, err := repo.MergeToMaster(); err != nil {
+ log.Info("merge from devel failed", repo.GetGoPath(), err)
+ return
+ }
}
})