What problem does it solve? Stale pull requests that sat while the base branch advanced often accumulate dozens of conflicts across unrelated file classes, and ad-hoc file-by-file resolution silently drops one side's security fixes, accessibility patches, or redesigns. This Skill provides a disciplined procedure to inventory conflicts, resolve them by lineage class, re-apply clobbered fixes, and re-verify the merged tree. ## Core Features & Use Cases - Trial-merge conflict inventory: Runs a no-commit merge to capture the full conflict list in one shot before touching any file. - Lineage-based conflict triage: Classifies conflicts into meta/config files, append-only knowledge files, and branch-owned product surfaces, each with a mechanical resolution rule. - Fix re-application and gate re-verification: Re-applies base-branch security and accessibility fixes onto kept branch code, invalidates stale gate stamps, and re-runs the full build, test, a11y, and security gates on the merged tree. - Use Case: A feature PR sat for weeks while main gained new CI gates and an auth-pattern migration; use this Skill to merge main in, keep the branch's redesign, re-apply the new auth pattern, and prove the merged tree passes every gate. ## Quick Start Ask the agent to rescue the stale PR branch by merging the latest base branch into it, triaging conflicts by file class, and re-running all quality gates on the merged tree.
