fixes from cleaning an old set of reposv0.22.60

1 files changed, 10 insertions, 8 deletions

diff --git a/doCheckout.go b/doCheckout.go
index 40522e7..eb85818 100644
--- a/doCheckout.go
+++ b/doCheckout.go
@@ -199,14 +199,16 @@ func rillCheckoutMaster(repo *gitpb.Repo) error {
 		repo.CheckoutMaster()
 		return nil
 	}
-	if repo.GetUserVersion() != repo.GetDevelVersion() {
-		// don't switch branches 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.GetUserVersion() != repo.GetDevelVersion() {
+			// don't switch branches 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
+		}
+	*/
 	repo.CheckoutMaster()
 	return nil
 }