From d4cc68c07f2309ddefc904215d79e21fd8eb034a Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Sun, 19 Jan 2025 07:06:31 -0600
Subject: no need to warn anymore on nonexistent user branch

---
 reloadRepoState.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'reloadRepoState.go')

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"
-- 
cgit v1.2.3