merge-reconciler

Resolves git merge conflicts between parallel agent branches as a neutral third party.

Updated Sep 20, 2026
One-click install
npx skills add https://github.com/GreenyZA/neo-light --skill merge-reconciler-greenyza
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge-reconciler
Source: https://github.com/GreenyZA/neo-light/tree/main/.hermes-home/skills/autonomous-ai-agents/merge-reconciler
Command: npx skills add https://github.com/GreenyZA/neo-light --skill merge-reconciler-greenyza

SYSTEM DOCUMENTATION & REQUIREMENTS

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 resolution rules. - Impartiality Contract: Enforces neutral arbitration — no favoring the spawning agent, no drive-by edits, and every design decision surfaced in the hand-back summary. - Kanban-Native Workflow: Integrates with hermes kanban cards so a third-party reconciler profile automatically receives both sides' completion summaries via parent links. - Use Case: During a parallel-PR campaign, two worker agents modify the same module. Spawn a neutral reconciler subagent with both branch names and intent summaries; it classifies each conflict, merges both intents, runs the build, and reports every decision for human veto. ## Quick Start Ask the agent to act as a neutral merge reconciler for the halted merge in this repository, using the completion summaries from both conflicting kanban tasks to classify and resolve each conflicted hunk.

Frequently Asked Questions about merge-reconciler

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve git merge conflicts between two AI agents?▼

Spawn a neutral third-party agent with the repo path, both branch names, and both sides' intent summaries. The reconciler classifies each conflicted hunk as disjoint-intent, same-question-different-answer, or superseded, then merges accordingly and verifies with the project build.

Why shouldn't an agent resolve conflicts against another agent's work?▼

Agents resolving conflicts against a peer lack the peer's context and are structurally biased toward their own changes, so they reliably overwrite the peer's work or abandon their own. A neutral reconciler with both stated intents produces a fair merged result.

When should I not use a merge reconciliation workflow?▼

Do not use it for conflicts within a single agent's own work or for trivial lockfile and generated-file conflicts, which should simply be regenerated. It is designed for genuine collisions between two agents' parallel branches.

How does kanban integration help with merge conflict resolution?▼

Create a reconciliation card assigned to a third profile with both conflicted cards linked as parents. The parent links automatically carry both sides' completion summaries into the reconciler's context, supplying the intent information needed for impartial decisions.

What happens when both sides of a conflict have equally valid intents?▼

If intents genuinely tie, the reconciler escalates by blocking the kanban card or reporting back rather than guessing. It never splits the difference into a hybrid design that neither side asked for.

What do repeated conflicts on the same file indicate?▼

Repeated conflicts on the same file across rounds signal a hotspot, not routine reconciliation work. The reconciler flags it with a kanban comment so the orchestrator decomposes that file instead of serially reconciling every new collision.