diff --git a/bin/autoresolve b/bin/autoresolve index 6bbd8a73..6e3b8911 100755 --- a/bin/autoresolve +++ b/bin/autoresolve @@ -153,8 +153,8 @@ for (( i = 0; i < $TOTAL_PULL_REQUESTS; i++ )); do PR_NUMBER=$(read_json_var "$PULL_REQUESTS" .[$i].node.number) PR_MERGEABLE=$(read_json_var "$PULL_REQUESTS" .[$i].node.mergeable) - if [[ "$PR_MERGEABLE" != "CONFLICTING" ]]; then - echo "Ignoring pull request #$PR_NUMBER. No conflicts detected ($PR_MERGEABLE)" + if [[ "$PR_MERGEABLE" != "CONFLICTING" ]] && [[ "$PR_MERGEABLE" != "UNKNOWN" ]]; then + echo "Ignoring pull request #$PR_NUMBER. No conflicts detected" continue fi