From 2856d88b1254f51770f94d903396ca45f5389e41 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Sat, 22 Feb 2025 19:11:42 -0600
Subject: [PATCH] try merge to master also

---
 doGui.go | 8 ++++++++
 1 file changed, 8 insertions(+)

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
+				}
 
 			}
 		})