diff options
Diffstat (limited to 'doCheckout.go')
| -rw-r--r-- | doCheckout.go | 4 |
1 files changed, 4 insertions, 0 deletions
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 |