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.