Neutral arbiter for merge conflicts between two agents.
Security grade of this SKILL.md: SAFE · how we grade
How to install agent-merge-conflict-arbiter
npx skills add NousResearch/hermes-agent --skill agent-merge-conflict-arbiter -a claude-code
The skills CLI copies this one skill into Claude Code (use -a for another agent). Or read its SKILL.md on GitHub.
What the SKILL.md says
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. 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).
Other skills in NousResearch/hermes-agent
1passwordSet up op CLI, sign in, and read or inject secrets.
3-statement-modelBuild integrated IS/BS/CF financial workbooks in Excel.
accelerateRun PyTorch training across GPUs with minimal changes.
actual-setupSet up Actual Computer (actual.inc) inference in Hermes.
adversarial-ux-testRoleplay a hostile user to find and triage UX pain points.
agentmailUse when an agent needs AgentMail CLI email inboxes.
ai-presenter-videoMake a verified AI presenter video from script + image.
airtableAirtable REST API via curl. Records CRUD, filters, upserts.
anatomyExplain an idea as an interactive isometric machine figure.
antigravity-cliOperate the Antigravity CLI (agy): plugins, auth, sandbox.
apple-notesManage Apple Notes via memo CLI: create, search, edit.
apple-remindersApple Reminders via remindctl: add, list, complete.
archifyValidated interactive HTML diagrams, upstream-maintained.