What problem does it solve? Feature branches drift behind their PR base or the repo default branch, causing stale code, surprise conflicts at merge time, and unmergeable pull requests. This Skill brings a branch up to date with its merge target in a single, reviewable merge commit. ## Core Features & Use Cases - Target resolution via /check-merge: Detects whether the branch is contained, advanced, merged, or closed before doing any work, syncing against the PR base ref or the repo default branch as fallback. - Single merge commit with logical conflict resolution: Resolves conflicts both mechanically and semantically (keep-both, repointing callers, adopting shared abstractions), producing one merge commit whose combined diff isolates the judgment for review. - Local verification and safe push: Runs conflict-marker checks and the project's vet script before pushing, uses fast-forward-only pushes, and reports the pre-merge tip as a revert target. - Use Case: A feature branch has fallen 20 commits behind main and its PR shows conflicts. Invoke the skill to merge origin/main in, reconcile the overlapping changes, run the vet suite, and push the synced branch for review. ## Quick Start Ask the AI to sync the current branch up to its PR base by saying "sync this branch with main and resolve any conflicts".
