maybe got it back to merging

This commit is contained in:
Jeff Carr 2025-01-30 11:09:34 -06:00
parent 0ff7e62c60
commit 026d95b9c2
1 changed files with 15 additions and 0 deletions

View File

@ -133,9 +133,24 @@ func (r *repoWindow) repoMenu() *gui.Node {
} }
repo := view.GetPb() repo := view.GetPb()
log.Info("repo:", repo.GetGoPath()) log.Info("repo:", repo.GetGoPath())
if result, err := repo.MergeUserToDevel(); err == nil {
log.Warn("THINGS SEEM OK", repo.GetFullPath())
} else {
log.Warn("THINGS FAILED ", repo.GetFullPath())
log.Warn("err", err)
for _, line := range result.Stdout {
log.Warn("stdout:", line)
}
for _, line := range result.Stderr {
log.Warn("stderr:", line)
}
break
}
me.forge.SetConfigSave(true)
repo.Reload() repo.Reload()
view.Update() view.Update()
} }
me.forge.ConfigSave()
r.Enable() r.Enable()
}) })