From 3809663e6e5f88ad37036392592f47f8d5d32f06 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Mon, 13 Jan 2025 08:55:06 -0600
Subject: [PATCH] things are safe to turn off merge for every repo

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

diff --git a/windowRepos.go b/windowRepos.go
index adaa5d6..055a871 100644
--- a/windowRepos.go
+++ b/windowRepos.go
@@ -232,6 +232,10 @@ func (r *repoWindow) mergeAllUserToDevel() bool {
 			log.Info("not on user branch", repo.GetFullPath())
 			continue
 		}
+		if repo.GetDevelVersion() == repo.GetUserVersion() {
+			log.Info("devel and user branch are the same", repo.GetFullPath())
+			continue
+		}
 		if result, err := repo.MergeUserToDevel(); err == nil {
 			log.Warn("THINGS SEEM OK", repo.GetFullPath())
 			repo.Reload()