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

[PierreBrisorgueil]

Summary

• Add mergeable check (step 2b) after CI passes in convergence loop
• Stop early and report to user if PR has merge conflicts
• Update section 6f to reference the new mid-loop check

Closes #3236

Test plan

• PR with no conflicts → loop proceeds normally
• PR with conflicts → loop stops and reports

Summary by CodeRabbit

• Documentation
  • Updated pull request merge procedures documentation with enhanced conflict detection and status validation throughout the merge workflow.

[coderabbitai]

Warning

Rate limit exceeded

@PierreBrisorgueil has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 14 minutes and 16 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 4439a68a-e7b4-49d2-97ac-ce0c2390555b

📥 Commits

Reviewing files that changed from the base of the PR and between 62b1dc3 and b0f19e9.

📒 Files selected for processing (1)

• .claude/skills/pull-request/SKILL.md

Walkthrough

Updated the pull-request skill's convergence loop to add an early mergeable status check (step 2b) that stops iteration if a merge conflict is detected, instead of only checking at the final stop condition.

Changes

Cohort / File(s)	Summary
PR Skill Convergence Loop .claude/skills/pull-request/SKILL.md	Added step 2b to check mergeable status after CI passes and stop early if CONFLICTING; updated stop condition (6f) to clarify that mergeable conflicts can trigger early termination.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Possibly related issues

• #3707: Makes identical changes to add mid-loop mergeable check (step 2b) and update stop condition 6f for CONFLICTING conflict handling.

Possibly related PRs

• Node#3160: Modifies the pull-request skill's monitoring loop and conflict/mergeable status handling behavior.
• Node#3147: Adds mergeable-status checks to the PR monitoring loop with stopping logic on CONFLICTING state.

Suggested labels

Chore

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Description check	⚠️ Warning	The description covers the main objectives but is missing several required template sections including scope, validation checklist, and guardrails check.	Complete the PR description by adding the Scope, Validation, and Guardrails check sections as per the repository template, including module impact and validation steps.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title accurately and concisely describes the main change: adding a merge conflict check in the PR convergence loop.
Linked Issues check	✅ Passed	The PR implements the exact fix proposed in issue #3236: adds mergeable check (step 2b) after CI passes and updates section 6f accordingly.
Out of Scope Changes check	✅ Passed	The changes are limited to the specified file and directly address the requirements in issue #3236, with no extraneous modifications detected.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch fix/skill-mergeable-check

📝 Coding Plan

• Generate coding plan for human review comments

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[Copilot]

Pull request overview

This PR updates the /pull-request skill’s convergence loop to detect merge conflicts earlier, so the loop stops immediately when a PR becomes unmergeable mid-iteration (as requested in #3236).

Changes:

• Add a mid-loop mergeable status check (step 2b) after CI passes.
• Stop early and report to the user if the PR is CONFLICTING.
• Update the stop-condition section (6f) to reference the new step 2b check.