What problem does it solve? When two AI 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 changes, 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 Integration: Supports spawning a neutral third-profile reconciler agent via kanban cards linked to both conflicted tasks. - Use Case: During a parallel-PR campaign, two agents modify the same module and the merge halts. Spawn a reconciler subagent with both branch names and intent 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 merge reconciler for the halted merge in this repo, using the completion summaries from both conflicted branches to classify and resolve each conflicted hunk.
