johba/disinto
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

fix: detect merge conflicts in approved PRs

Browse source 
PR #649 sat blocked for hours — CI passed, review approved, but
merge conflict from other PRs landing. Supervisor said 'all clear'.

Now checks mergeable=false before CI state, alerts on conflict.
This commit is contained in:
openhands 2026-03-13 06:36:23 +00:00
parent 00dc3a6195
commit 2778fa4ea5
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
factory/factory-poll.sh
View file

@ -230,7 +230,11 @@ for pr in $OPEN_PRS; do
CI_STATE=$(codeberg_api GET "/commits/${PR_SHA}/status" 2>/dev/null | jq -r '.state // "unknown"' 2>/dev/null || true)
if [ "$CI_STATE" = "failure" ] || [ "$CI_STATE" = "error" ]; then
# Check for merge conflicts first (approved + CI pass but unmergeable)
MERGEABLE=$(echo "$PR_JSON" | jq -r '.mergeable // true')
if [ "$MERGEABLE" = "false" ] && [ "$CI_STATE" = "success" ]; then
p3 "PR #${pr}: CI pass but merge conflict — needs rebase"
elif [ "$CI_STATE" = "failure" ] || [ "$CI_STATE" = "error" ]; then
UPDATED=$(echo "$PR_JSON" | jq -r '.updated_at // ""')
if [ -n "$UPDATED" ]; then
UPDATED_EPOCH=$(date -d "$UPDATED" +%s 2>/dev/null || echo 0)