From b9d4f88abdde4ff72a454f875c64e9c513840a58 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Sun, 19 Jan 2025 03:39:35 -0600
Subject: more checks on merge to master

---
 doCheckout.go | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doCheckout.go')

diff --git a/doCheckout.go b/doCheckout.go
index d9fe1a4..b168da3 100644
--- a/doCheckout.go
+++ b/doCheckout.go
@@ -144,6 +144,10 @@ func rillCheckoutMaster(repo *gitpb.Repo) error {
 		// don't switch braches if the user branch has uncommitted patches
 		return nil
 	}
+	if repo.GetDevelVersion() != repo.GetMasterVersion() {
+		// don't switch braches if the devel branch does not match master (needs merge)
+		return nil
+	}
 	if repo.GetCurrentBranchName() == repo.GetMasterBranchName() {
 		// repo is already on master
 		return nil
-- 
cgit v1.2.3