merge manually

githelper

@@ -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