Permalink
Browse files

merge manually

  • Loading branch information...
1 parent b0ec888 commit f1d21a2db3b855448d6ec017fc13f505403aa5ce @ipa-tys committed May 8, 2012
Showing with 6 additions and 4 deletions.
  1. +6 −4 githelper
View
@@ -311,9 +311,11 @@ def main():
# change environment to stack path
full_dir = os.path.expanduser(options.install_dir + "/" + stack)
if not os.path.exists(full_dir):
- parser.error("selected stack " + stack + " not found in " + options.install_dir + ", aborting...")
- exit(1)
-
+ print "Selected stack " + stack + " not found in " + options.install_dir + ", aborting..."
+ write_to_log("Selected stack " + stack + " not found in " + options.install_dir + ", aborting...")
+ write_to_log("")
+ continue
+
# set working directory to stack directory
os.chdir(full_dir)
print "-------------------------------------------"
@@ -460,7 +462,7 @@ def check_for_changes():
if status != "":
print "ERROR: found local changes in " + os.getcwd() + ": please commit or reset them first before continuing, aborting..."
print "Status: \n" + status
- exit(1)
+ return
## check if a merge is conflicting

0 comments on commit f1d21a2

Please sign in to comment.