Menu
Resolve merge or rebase conflicts semantically, then re-verify the full gates
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Verify, review, and push pending work as one milestone commit
Drive the current branch's PR to merge-ready: CI green and every review comment handled, ending with an outcome label
After owner accept: guard-checked squash-merge of the current branch's PR, base sync and branch cleanup
Open a pull request for the current branch against its target, using the repo template
Triage PR review comments: fix, discuss, or decline with reason - every thread answered
Cut a release: version, changelog, tag, and release object — policy-driven across trunk/gitflow and tag-only/full
| name | git-resolve-conflicts |
| description | Resolve merge or rebase conflicts semantically, then re-verify the full gates |
The result must preserve the intent of both sides, never just pick one. Invoke when git reports conflicts or a PR shows CONFLICTING.
git status - identify the operation (merge/rebase/cherry-pick) and the conflicted files.git log --oneline <ours>..<theirs> -- <file> and the reverse. Goals matter more than text.dev-run-tests) - a clean merge that fails tests is not resolved.git rebase --continue) and push fast-forward.git grep -n '<<<<<<<' returns nothing; gates green; behavior from both branches survives.update_strategy; the PR loop - git-finalize-pr.