pr-reconcile

Rebases conflicting pull requests and resolves review threads to restore mergeable state.

1|1|Updated Oct 3, 2021
One-click install
npx skills add https://github.com/benjr70/Smart-Smoker-V2 --skill pr-reconcile-benjr70
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: pr-reconcile
Source: https://github.com/benjr70/Smart-Smoker-V2/tree/main/.claude/skills/pr-reconcile
Command: npx skills add https://github.com/benjr70/Smart-Smoker-V2 --skill pr-reconcile-benjr70

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Open pull requests on agent-driven workflows drift out of a mergeable state: master moves under them causing merge conflicts, human reviewers hand them back with unresolved comment threads, or a prior automation run died before finishing CI and manual verification. This Skill autonomously brings one such PR back to a green, review-clean state without human intervention. ## Core Features & Use Cases - Conflict Rebase: Rebases the PR branch onto master using a dedicated rebase driver, spawning an implementer subagent to resolve conflicts in place, and pushing with --force-with-lease as the only sanctioned force push. - Review Thread Resolution: Enumerates unresolved review threads via GraphQL, spawns implementer rounds (capped at 3) to address each comment, replies in-thread with what changed, and resolves each thread. - Verification Tail: Re-runs CI watching, a marker-gated one-time PR review, and a blocking manual verification round after any push, with strict rules preventing a PASS result without real verification evidence. - Escalation Paths: Parks unresolvable PRs with labels like AFK:rebase-failed or AFK:revise-failed and explanatory comments instead of looping forever. - Use Case: A daemon triage step picks PR #512 because it both conflicts with master and carries the AFK:revise label; this Skill rebases it, fixes the three review comments, re-runs CI and manual verification, and reports a clean PASS. ## Quick Start Invoke the skill with the PR number, branch, issue number, and triage reason, for example: run /pr-reconcile --pr 512 --branch feat/issue-87 --issue 87 --reason both.

Frequently Asked Questions about pr-reconcile

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I automatically fix merge conflicts on a GitHub pull request?

Invoke the skill with the PR number, branch, issue, and reason conflict. It rebases the branch onto origin/master using a rebase driver, spawns an implementer subagent to resolve conflicted files in place, then pushes with --force-with-lease.

How to address GitHub review comments programmatically?

The skill enumerates unresolved review threads via GraphQL, spawns up to three implementer rounds to change the code, commits and pushes the fixes, then replies in each thread with what changed and resolves it. Disputed threads stay open for human triage.

Does this skill merge the pull request after fixing it?

No, the skill never merges the PR. It only restores a green, review-clean state with resolved threads and passing verification; the merge decision stays human-gated.

What happens when a rebase or review fix cannot be completed?

The skill aborts the rebase, applies a parking label such as AFK:rebase-failed or AFK:revise-failed, and posts an explanatory PR comment. It never forces through a rejected lease push or argues with a human reviewer's comment.

Why does the skill require a manual verification round before reporting PASS?

Any push stales all prior CI and verification evidence, so the full verification tail re-runs. A PASS result requires a real manual-verify verdict line; a missing or refused round parks the PR as draft with AFK:checks-failed instead of passing.