jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

things are safe to turn off merge for every repo

This commit is contained in:
Jeff Carr 2025-01-13 08:55:06 -06:00
parent f4bad31b0b
commit 3809663e6e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
windowRepos.go
View File

@ -232,6 +232,10 @@ func (r *repoWindow) mergeAllUserToDevel() bool {
log.Info("not on user branch", repo.GetFullPath()) log.Info("not on user branch", repo.GetFullPath())
continue 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 { if result, err := repo.MergeUserToDevel(); err == nil {
log.Warn("THINGS SEEM OK", repo.GetFullPath()) log.Warn("THINGS SEEM OK", repo.GetFullPath())
repo.Reload() repo.Reload()