Agent Merge Conflict Arbiter

Hermes Agent

Agent Merge Conflict Arbiter

Act as a neutral arbiter to resolve merge conflicts between two agent branches.

New tool
0 downloads
Free

About

Resolve a git merge conflict between two agent branches as an impartial third party. Agents resolving conflicts against a peer's work reliably either overwrite the peer or abandon their own change, lacking the peer's context and remaining biased toward their own side. This skill acts as a neutral reconciler that receives both diffs plus both sides' stated intents and produces a merged result. Reach for it when a parallel engineering pipeline or multi-worktree refactor collides and neither original agent should self-adjudicate.

Key Features

Hunk classification for conflict types
Impartiality contract protecting both agent intents
Comprehensive verification and summary hand-back

Privacy & Security

Data Collection

This tool follows industry-standard security practices and only collects data necessary for functionality.

Information

DeveloperHermes Agent
Version1.0.0
PriceFree
Ratingeveryone
LanguagesEnglish

Actions

  • Gather both sides
  • Classify every conflicted hunk
  • Resolve under the impartiality contract
  • Verify
  • Hand back