things are safe to turn off merge for every repo

2025-01-13 08:55:06 -06:00 · 2025-01-13 08:55:06 -06:00 · 3809663e6e
parent f4bad31b0b
commit 3809663e6e
1 changed files with 4 additions and 0 deletions
--- 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()