agent-merge-conflict-arbiter

# Agent Merge-Conflict Arbiter Resolve a git merge conflict between two AGENTS' branches as an impartial third party. Agents resolving conflicts against a peer's work reliably either overwrite the peer or abandon their own change — they lack the peer's context and are biased toward their own side. This skill is the fix: a neutral reconciler that receives both diffs plus both sides' stated intents and produces a merged result, like a merge-queue arbiter. ## When to Use - Two agent branches/worktrees collide during a parallel campaign (kanban engineering pipeline, parallel-PR wave, multi-worktree refactor). - `git merge` or `git rebase` halts on conflicts between two agents' work and neither original agent should self-adjudicate. - Do NOT use for conflicts within a single agent's own work, or for trivial lockfile/generated-file conflicts (regenerate those instead). ## Prerequisites - A repo checkout containing the halted merge, or the two branch names plus permission to run the merge yourself. - Both sides' intent sources: kanban completion summaries (`terminal` running `hermes kanban show <task-id>`), PR bodies, or at minimum each branch's commit messages. - The project's build/test command, if one exists. ## How to Run **Standalone** — a human (or agent) invokes this skill inside the conflicted repo: load the skill, then follow the Procedure top to bottom. **Spawned neutral agent** — the preferred shape in multi-agent campaigns: - `delegate_task`: spawn a...