diff options
Diffstat (limited to 'windowRepos.go')
| -rw-r--r-- | windowRepos.go | 4 |
1 files changed, 4 insertions, 0 deletions
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() |