Menu
Resolve an active merge or rebase conflict, including safe renumbering of colliding plans and chronicles.
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
Compare Claude Code and Codex on the same real code-change task with isolated worktrees, identical gates, transcripts, time, and cost.
Align AGENTS.md, rules, README, plans, and chronicles with the codebase; use --clean to archive obsolete task docs into ATLAS.md.
Research current best practices and turn the evidence into a clear recommendation. Use for state-of-the-art, evidence-based, optimal-approach, comparison, or pros-and-cons questions in any field.
Clarify an ambiguous or consequential change before planning or implementation when more than one sound approach exists.
Add CHANGELOG.md entries, derive them from commits, or cut a Keep a Changelog and SemVer release.
Create a user-requested Conventional Commit from the staged changes.
| name | resolve-merge |
| description | Resolve an active merge or rebase conflict, including safe renumbering of colliding plans and chronicles. |
| user-invocable | true |
| allowed-tools | Glob, Grep, Read, Bash, Edit, Write, AskUserQuestion |
git rev-parse -q --verify MERGE_HEAD || git rev-parse -q --verify REBASE_HEAD; if neither resolves (no merge/rebase in progress), stop with "No merge in progress."git status --short and classify each conflicted file AUTO or JUDGMENT.git show :2:<f> vs :3:<f>) or differing only in whitespace/EOL → take either.git add, but git rm if its slug already exists in theirs at another number (duplicate).CHANGELOG.md → merge unique entries, dedupe, keep category order.docs/plans/NNNN__*, docs/chronicles/NNNN__*): use THEIRS numbering as base, place each OURS-unique file at the next free number on collision, leave no gaps or duplicates; then fix internal refs so each plan's research ref and each chronicle's self-ref match its own number and every cross-ref resolves.AskUserQuestion: Approve / Modify / Abort. Abort leaves all files untouched.Skipped. Never abort the run for one file.N resolved: X AUTO, Y JUDGMENT; Skipped: …), then hand off to /commit — do not commit. If a check fails, report the failure and stop.(Codex: replace each AskUserQuestion gate with a numbered list + STOP — see ../using-development-skills/references/codex-tools.md.)