diff options
| -rw-r--r-- | doCheckout.go | 2 | ||||
| -rw-r--r-- | doClean.go | 2 | ||||
| -rw-r--r-- | main.go | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doCheckout.go b/doCheckout.go index bbe0ac0..37b1519 100644 --- a/doCheckout.go +++ b/doCheckout.go @@ -34,7 +34,7 @@ func doCheckout() error { } if argv.Checkout.Master != nil { - setForgeMode(forgepb.ForgeMode_MASTER) // disable "normal" mode if set + setForgeMode(forgepb.ForgeMode_CLEAN) // disable "normal" mode if set if err := me.forge.DoAllCheckoutMaster(); err != nil { badExit(err) @@ -249,7 +249,7 @@ func justDeleteTheDevelBranchAlready(repo *gitpb.Repo) error { return err } cmd := []string{"git", "merge something somehow"} - log.Info("DEVEL LOCAL NEEDS GIT MERGE TO MASTER", repo.GetGoPath(), cmd, b1) + log.Info("devel local, remote and master branches are wrong", repo.GetGoPath(), cmd, b1) // _, err := repo.RunVerbose(cmd) return nil } @@ -73,7 +73,7 @@ func main() { } if argv.Checkout != nil { - setForgeMode(forgepb.ForgeMode_MASTER) + setForgeMode(forgepb.ForgeMode_DEVEL) if err := doCheckout(); err != nil { badExit(err) } @@ -133,7 +133,7 @@ func main() { log.Info("you were aleady not in the normal state") okExit("") } - setForgeMode(forgepb.ForgeMode_MASTER) + setForgeMode(forgepb.ForgeMode_DEVEL) log.Info("normal mode off") okExit("") } |