tyler.durden/L10n
1
0
Fork 0
mirror of https://github.com/Icinga/L10n.git synced 2025-07-31 01:34:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

bin/autoresolve: Include mergeable in the log if it's not CONFLICTING

Browse Source
This commit is contained in:
Johannes Meyer 2020-05-27 14:04:45 +02:00
parent 275ddfdf4b
commit 089bc11526
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/autoresolve
View File

@ -154,7 +154,7 @@ for (( i = 0; i < $TOTAL_PULL_REQUESTS; i++ )); do
PR_MERGEABLE=$(read_json_var "$PULL_REQUESTS" .[$i].node.mergeable)
if [[ "$PR_MERGEABLE" != "CONFLICTING" ]]; then
echo "Ignoring pull request #$PR_NUMBER. No conflicts detected"
echo "Ignoring pull request #$PR_NUMBER. No conflicts detected ($PR_MERGEABLE)"
continue
fi