Individual skill

agent-merge-conflict-arbiter

0upvotes

Neutral arbiter for merge conflicts between two agents.

optional-skills/autonomous-ai-agents/agent-merge-conflict-arbiter/SKILL.md

Read pinned source

Source commit 10ecd43a33134a935a7abd1a48684953393e1ffa

What was checked

Matches the observed repository HEAD: Yes
Scanner rules are current: Yes
Repository scan complete: No
Skill scan complete: Yes
Observed behavior: Instructions only
Last checked: Nov 9, 2026

These are observations at the recorded commit, not a guarantee of safety. Review the source before running it.

Install this skill

Choose an agent in your Stack or copy a command below. Commands fetch the pinned commit and copy only this skill directory. Existing destinations are refused. Copying a command does not install anything.

An install command is unavailable: current rules, complete repository and skill scans, an eligible behavior level and a permitted license are required.

Repository context

Repository stars (not skill ratings): 262,010
Repository last updated: Nov 9, 2026
License: MIT

Observed agent integration: No specific integration evidence. Standard SKILL.md installation does not imply verified compatibility.

ai Repository topic
ai-agent Repository topic
ai-agents Repository topic
llm Repository topic
anthropic Repository topic
chatgpt Repository topic
claude Repository topic
claude-code Repository topic
codex Repository topic
hermes Repository topic
engineering Derived category

Files and excerpt

File metadata and permitted, redacted excerpts come from the recorded scan. Source links are pinned to that commit.

Browse files

SKILL.mdcore · 7,629 bytes

Read excerpt


# 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