diff options
| author | Jeff Carr <[email protected]> | 2025-02-22 04:46:45 -0600 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-02-22 04:46:45 -0600 |
| commit | 79178228b3113ed770cf0325aeea8acdc67c392f (patch) | |
| tree | 67a5a413d28dc38bc56cfc5fcfab9afcace94c0e /windowRepoProblems.go | |
| parent | c1f7968f7cf66430c8d4ca352f0830b3029a4f08 (diff) | |
attempt to merge devel
Diffstat (limited to 'windowRepoProblems.go')
| -rw-r--r-- | windowRepoProblems.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/windowRepoProblems.go b/windowRepoProblems.go index b8f39d8..61f5240 100644 --- a/windowRepoProblems.go +++ b/windowRepoProblems.go @@ -104,8 +104,12 @@ func makeRepoProblemsWindow() *repoProblemsWindow { repo := all.Next() mname := repo.GetMasterBranchName() dname := repo.GetDevelBranchName() - cmd := []string{"git", "merge", mname, dname} + if dname != repo.GetCurrentBranchName() { + log.Info("Repo is not on the devel branch", repo.GetGoPath()) + } + cmd := []string{"git", "merge", mname} log.Info(repo.GetGoPath(), cmd) + repo.RunVerbose(cmd) } }) hbox.NewButton("test", func() { |