tyler.durden
/
L10n
mirror of https://github.com/Icinga/L10n.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bin/autoresolve: Still attempt a merge if the API doesn't know its possible

This commit is contained in:
Johannes Meyer 2020-05-28 10:26:35 +02:00
parent 620bb8b25b
commit 5b52c870e6
1 changed files with 2 additions and 2 deletions

4
bin/autoresolve
View File

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