diff options
| -rw-r--r-- | doCheckout.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doCheckout.go b/doCheckout.go index 85e4fdb..2946500 100644 --- a/doCheckout.go +++ b/doCheckout.go @@ -179,15 +179,15 @@ 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 me.forge.Config.IsReadOnly(repo.GetGoPath()) { // skip other checks for readonly repos 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 |