add doCheckout() back

1 files changed, 6 insertions, 8 deletions

diff --git a/main.go b/main.go
index f60374c..5152f1e 100644
--- a/main.go
+++ b/main.go
@@ -90,14 +90,12 @@ func main() {
 		okExit("")
 	}
 
-	/*
-		if argv.Checkout != nil {
-			if err := doCheckout(); err != nil {
-				badExit(err)
-			}
-			okExit("")
+	if argv.Checkout != nil {
+		if err := doCheckout(); err != nil {
+			badExit(err)
 		}
-	*/
+		okExit("")
+	}
 
 	if argv.Build != "" {
 		if err := doBuild(); err != nil {
@@ -163,7 +161,7 @@ func main() {
 			}
 			okExit("master merge ok")
 		}
-		badExit(fmt.Errorf("merge what?"))
+		badExit(fmt.Errorf("You must choose which branch to merge to (devel or master)"))
 	}
 
 	if argv.Pull != nil {