merge-resolvelisted

# Merge resolve — cross-family merge-conflict resolution, operator-gated by default This skill is the inter-branch analogue of `chain`'s semantic gate (`kind: semantic, check: ai_cross_check`): a cross-family read on the two sides' intent + commit context, a proposed unified resolution as a diff, and an **operator-confirm gate** before any change touches the working tree. The cross-check is the engine; the operator-confirm and the validator gates are the safety net. **The default is operator-confirm. Auto-apply is opt-in, gated by a multi-condition policy file, and refuses for high-sensitivity paths regardless of operator opt-in.** These are the operator's risk-acceptance posture; they are not stylistic prose, and the skill enforces them at runtime. ## When to use **Explicit triggers** (user-typed): "resolve this merge conflict," "ai-merge," "merge with the reviewer," "have the reviewer help merge," "AI-resolve this conflict," "use the reviewer to merge this." **Situational triggers** (proactive): - A `git merge` or `git rebase` exited non-zero with conflict markers in the recent transcript. - `git status` shows `Unmerged paths:` and the user asks anything about next steps. - Worktree-fanout / parallel-agent flows need N parallel results to integrate back to a base branch. - A chain step produces a diff destined for a file the user is currently editing (potential conflict surface). ## When to skip - **The conflict is trivial** (whitespace-only, deterministic merge of