start ignoring missing user branch
This commit is contained in:
parent
f0f11794ed
commit
383edb2766
|
@ -173,6 +173,10 @@ func rillCheckoutMaster(repo *gitpb.Repo) error {
|
|||
// repo is already on master
|
||||
return nil
|
||||
}
|
||||
if repo.GetUserVersion() == "uerr" {
|
||||
repo.CheckoutMaster()
|
||||
return nil
|
||||
}
|
||||
if repo.GetUserVersion() != repo.GetDevelVersion() {
|
||||
// don't switch branches if the user branch has uncommitted patches
|
||||
return nil
|
||||
|
|
Loading…
Reference in New Issue