What problem does it solve? When two agents working in parallel produce conflicting git branches, neither agent can fairly resolve the conflict — each lacks the peer's context and is biased toward its own change, leading to overwritten work or abandoned features. This Skill provides an impartial reconciliation procedure that merges both sides based on their stated intents. ## Core Features & Use Cases - Hunk Classification: Categorizes every conflicted hunk as disjoint-intent, same-question-different-answer, or superseded, with per-hunk rationale. - Impartiality Contract: Enforces rules against self-favoring, drive-by edits, and splitting the difference on design decisions. - Kanban-Native Spawning: Supports delegation via a third neutral profile with both conflicted cards linked as parents so intent summaries flow into context automatically. - Use Case: During a parallel-PR wave, two agent branches collide on a shared module. Spawn a reconciler subagent with both branch names and completion summaries; it classifies each hunk, merges disjoint changes, picks one answer per design collision, verifies with the build, and hands back a summary listing every decision. ## Quick Start Ask the agent to act as a neutral arbiter and resolve the halted merge between branch-a and branch-b in this repo, following the classify-resolve-verify procedure and reporting every hunk decision.
