What problem does it solve? When other pull requests merge into main after your branch was cut, your PR becomes unmergeable with conflicts that nothing surfaces automatically. This Skill guides an agent through rebasing the branch onto its moved base, resolving conflicts with judgment instead of mechanically, and verifying the result actually builds and passes tests. ## Core Features & Use Cases - Judgment-based conflict resolution: Distinguishes keep-both, pick-a-side, and genuinely disputed conflicts, and parks unresolvable disputes with a RESOLUTION: disputed marker for human decision instead of guessing. - History preservation: Replays existing commits onto the new base without squashing, lands resolutions inside the commit being replayed, and never leaves a conflict marker in a commit. - Behavioral verification: Runs the project's own build and test gates against the rebased tree, since a textually clean rebase can still be behaviorally wrong. - Use Case: A PR sits approved but unmergeable because three other PRs merged first. Dispatch this Skill to rebase the branch, resolve the shared-file conflicts, run the test suite, and leave the branch ready for the daemon's force-with-lease push. ## Quick Start Rebase this pull request branch onto origin/main, resolve each conflict by reading what both sides changed, and run the test suite before finishing.
