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

try merge to master also

This commit is contained in:
Jeff Carr 2025-02-22 19:11:42 -06:00
parent fd41059087
commit 2856d88b12
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doGui.go
View File

@ -254,6 +254,14 @@ func drawWindow(win *gadgets.BasicWindow) {
// log.Info(strings.Join(r.Stderr, "\n")) // log.Info(strings.Join(r.Stderr, "\n"))
return return
} }
if repo.CheckoutMaster() {
log.Info("checkout master failed", repo.GetGoPath())
return
}
if _, err := repo.MergeToMaster(); err != nil {
log.Info("merge from devel failed", repo.GetGoPath(), err)
return
}
} }
}) })