| name | resolving-merge-conflicts |
| description | Resolve an in-progress git merge or rebase conflict by understanding each side's original intent, then preserving both where possible. Use when a merge/rebase is mid-conflict, when the user asks to resolve conflicts, or after a /ship merge-back was aborted and they want to finish the merge by hand. |
Resolving Merge Conflicts
Resolve conflicts by understanding why each side changed the code, not by pattern-matching the <<<<<<< markers. Report to the user in Chinese (per ~/.claude/CLAUDE.md ยง1).
-
See the current state of the merge/rebase โ git status, git log --oneline --graph -20, and the conflicting files (git diff --name-only --diff-filter=U). Know which two commits/branches are meeting and what the merge is for.
-
Find the primary sources for each conflicting hunk. Understand deeply why each change was made and what the original intent was: read the commit messages, and โ since this repo tracks work locally โ the originating issue under .scratch/<feat>/issues/NN-*.md (its ## AC and ### ๅฎๆ record) and any docs/adr/ decision the hunk touches โ intent lives in those sources, not the diff alone.
-
Resolve each hunk. Preserve both intents where possible; where they're genuinely incompatible, pick the one matching the merge's stated goal and note the trade-off (a one-liner to the user, or an ADR if it's a real decision) โ never invent new behaviour or silently drop a side. Use the project's domain language (CONTEXT.md) for any names you introduce.
-
Run the project's automated checks. Discover them from docs/agents/domain.md (cached test/build/format commands); if absent, infer from config and confirm with the user. Run typecheck โ tests โ format, and fix anything the merge broke.
-
Finish the merge/rebase. Stage everything and commit (let git write the default merge message, or a short one naming what was reconciled). If rebasing, git rebase --continue until all commits are replayed.
Resolve, don't abort โ with one exception
The default is to resolve, never git merge --abort: the whole point of an attended conflict pass is to reconcile the two intents, and aborting throws that away.
The one exception is an unattended orchestration. /ship's merge-back runs with no human watching, so on a conflict it aborts (leaving main clean) and reports the issue failed rather than letting an agent guess and corrupt main. That's correct there. This skill is the attended counterpart: reach for it when a human is present to adjudicate the trade-offs โ e.g. to finish by hand a merge that /ship aborted.
