From e5b905c4481a3364070094b8ce0c2bf7fa5d481e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 6 Jun 2005 19:37:25 -0700 Subject: [PATCH] git-resolve-script: stop when the automated merge fails No point in doing a tree write that will just throw confusing messages on the screen. --- git-resolve-script | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git-resolve-script b/git-resolve-script index 74fb2875b..cd6e25a8a 100644 --- a/git-resolve-script +++ b/git-resolve-script @@ -47,7 +47,11 @@ merge_msg="Merge of $merge_repo" result_tree=$(git-write-tree 2> /dev/null) if [ $? -ne 0 ]; then echo "Simple merge failed, trying Automatic merge" - git-merge-cache git-merge-one-file-script -a + git-merge-cache -o git-merge-one-file-script -a + if [ $? -ne 0 ]; then + echo "Automatic merge failed, fix up by hand" + exit 1 + fi merge_msg="Automatic merge of $merge_repo" result_tree=$(git-write-tree) || exit 1 fi -- 2.26.2