try merge to master also

2025-02-22 19:11:42 -06:00 · 2025-02-22 19:11:42 -06:00 · 2856d88b12
parent fd41059087
commit 2856d88b12
1 changed files with 8 additions and 0 deletions
--- 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
+				}

 			}
 		})