agent-merge-conflict-arbiter

A skill in NousResearch/hermes-agent · 264,703 stars on GitHub

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

  • 1password Set up op CLI, sign in, and read or inject secrets.
  • 3-statement-model Build integrated IS/BS/CF financial workbooks in Excel.
  • accelerate Run PyTorch training across GPUs with minimal changes.
  • actual-setup Set up Actual Computer (actual.inc) inference in Hermes.
  • adversarial-ux-test Roleplay a hostile user to find and triage UX pain points.
  • agentmail Use when an agent needs AgentMail CLI email inboxes.
  • ai-presenter-video Make a verified AI presenter video from script + image.
  • airtable Airtable REST API via curl. Records CRUD, filters, upserts.
  • anatomy Explain an idea as an interactive isometric machine figure.
  • antigravity-cli Operate the Antigravity CLI (agy): plugins, auth, sandbox.
  • apple-notes Manage Apple Notes via memo CLI: create, search, edit.
  • apple-reminders Apple Reminders via remindctl: add, list, complete.
  • archify Validated interactive HTML diagrams, upstream-maintained.
  • architecture-diagram Dark-themed SVG architecture/cloud/infra diagrams as HTML.
  • arxiv Search arXiv papers by keyword, author, category, or ID.
  • ascii-art ASCII art: pyfiglet, cowsay, boxes, image-to-ascii.
  • ascii-video ASCII video: convert video/audio to colored ASCII MP4/GIF.
  • ast-grep AST-aware structural code search and rewrite via ast-grep.
  • auteur Design and build cinematic, award-level web pages.
  • axolotl Axolotl: YAML LLM fine-tuning (LoRA, DPO, GRPO).