diff options
Diffstat (limited to 'reloadRepoState.go')
| -rw-r--r-- | reloadRepoState.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/reloadRepoState.go b/reloadRepoState.go index 322c5b0..b4928c7 100644 --- a/reloadRepoState.go +++ b/reloadRepoState.go @@ -14,9 +14,13 @@ func (repo *Repo) setRepoState() { repo.State = "dirty" return } - if repo.GetUserVersion() != repo.GetDevelVersion() { - repo.State = "merge to devel" - return + if repo.GetUserVersion() == "uerr" { + // user has not made user branches + } else { + if repo.GetUserVersion() != repo.GetDevelVersion() { + repo.State = "merge to devel" + return + } } if repo.GetDevelVersion() != repo.GetMasterVersion() { repo.State = "merge to main" |