Skip to content

fix(skill): add merge conflict check in pull-request convergence loop #3237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PierreBrisorgueil merged 2 commits into from
Mar 15, 2026
Merged

fix(skill): add merge conflict check in pull-request convergence loop #3237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62b1dc3
fix(skill): add merge conflict check in pull-request convergence loop
PierreBrisorgueil Mar 15, 2026
b0f19e9
fix(skill): address copilot review — consistent $PR placeholder, expl…
PierreBrisorgueil Mar 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .claude/skills/pull-request/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,13 @@ After `gh pr ready`, enter an autonomous polling loop. Do not wait for the user
consecutive_zero = 0

REPEAT:
1. Wait for CI → sleep 30 then gh pr checks <number> --watch
1. Wait for CI → sleep 30 then gh pr checks $PR --watch
2. If CI fails → fix, /verify, commit, push, consecutive_zero=0, GOTO 1
2b. Check mergeable status → STATUS=$(gh pr view $PR --json mergeable --jq .mergeable)
if STATUS == "UNKNOWN" → sleep 10, retry up to 3 times
if STATUS == "CONFLICTING" → report to user and STOP
3. Grace period → sleep 180 + adaptive check (see 6b)
4. Re-check pending review checks → gh pr checks <number> — if any still pending, GOTO 3
4. Re-check pending review checks → gh pr checks $PR — if any still pending, GOTO 3
5. Read all feedback → unresolved threads only (see 6b)
6. If actionable comments → fix all, /verify, commit, push, reply, resolve, consecutive_zero=0, GOTO 1
7. If non-actionable unresolved → reply all explaining why, resolve all, consecutive_zero=0, GOTO 5
Expand Down Expand Up @@ -199,7 +202,7 @@ Wait 30s before watching CI (regular or force-push). Loop back to 6a. Never post

### 6f. Stop condition

CI green **and** 2 consecutive passes with zero unresolved threads. Then check branch protection:
CI green **and** 2 consecutive passes with zero unresolved threads. Mergeable status is also checked after every CI pass (step 2b) — conflicts cause an early stop. Final branch protection check:

```bash
gh pr view "$PR" --json reviewDecision,mergeable | jq '{reviewDecision, mergeable}'
Expand Down
Loading