merge-ready
Installation
SKILL.md
Merge ready
Drive the current work to the point where the only remaining step is Ben's own review and merge. The deliverable is a pushed branch with a clean pnpm ci:check, checkpoint commits along the way, and an open PR with a high-level description plus review instructions.
Never merge the PR. Ben always reviews last.
0. Figure out the starting point
This skill composes with feature work — it is not only a review pass:
- Invoked alongside a build request ("build X, make it merge-ready"): implement the feature/fix first, committing as you go, then continue below. The review phases cover all changes on the branch vs
origin/main, not just the last edit. - Invoked on existing work ("make this branch merge-ready"): start directly at step 1. The scope is
git diff origin/main...HEADplus anything uncommitted.
1. Sync with main
git fetch origin main. If the branch is behind, mergeorigin/mainin and resolve conflicts (favor main's version for code this branch didn't intentionally change).- Checkpoint: commit the merge before starting review, so conflict resolution is auditable separately from review fixes.