From 026d95b9c2a3aebe4b6867cc6f4da70b5297ddf4 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Thu, 30 Jan 2025 11:09:34 -0600
Subject: [PATCH] maybe got it back to merging

---
 windowRepos.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/windowRepos.go b/windowRepos.go
index 40241e2..43a2483 100644
--- a/windowRepos.go
+++ b/windowRepos.go
@@ -133,9 +133,24 @@ func (r *repoWindow) repoMenu() *gui.Node {
 			}
 			repo := view.GetPb()
 			log.Info("repo:", repo.GetGoPath())
+			if result, err := repo.MergeUserToDevel(); err == nil {
+				log.Warn("THINGS SEEM OK", repo.GetFullPath())
+			} else {
+				log.Warn("THINGS FAILED ", repo.GetFullPath())
+				log.Warn("err", err)
+				for _, line := range result.Stdout {
+					log.Warn("stdout:", line)
+				}
+				for _, line := range result.Stderr {
+					log.Warn("stderr:", line)
+				}
+				break
+			}
+			me.forge.SetConfigSave(true)
 			repo.Reload()
 			view.Update()
 		}
+		me.forge.ConfigSave()
 		r.Enable()
 	})