From 17063d65660cd8d6f52f89b7a49c56a013a7d900 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 27 May 2020 08:42:00 +0200 Subject: [PATCH] bin/autoresolve: Properly handle aborted/succeeding merges --- bin/autoresolve | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/autoresolve b/bin/autoresolve index dae98a84..da8f6111 100755 --- a/bin/autoresolve +++ b/bin/autoresolve @@ -222,6 +222,11 @@ for (( i = 0; i < $TOTAL_PULL_REQUESTS; i++ )); do # Attempt to merge master, should fail git merge --no-ff --no-commit origin/master || true + if [ ! -f .git/MERGE_HEAD ]; then + echo "Merge aborted or succeeded for some unknown reason. Cancelling pull request resolution" + continue + fi + # Resolve source catalog conflicts GIT_STATUS=$(git status -suno) while IFS= read -r line; do