diff --git a/windowRepos.go b/windowRepos.go index 40241e2..43a2483 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -133,9 +133,24 @@ func (r *repoWindow) repoMenu() *gui.Node { } repo := view.GetPb() 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() view.Update() } + me.forge.ConfigSave() r.Enable() })