Conflict Resolution Merger Skill for Autonomous Agents

Robust 3-way text and document reconciliation engine enabling multiple concurrent agents to modify shared workspaces, markdown documents, and source code files without overwriting each other's edits.

Features

• 3-Way Line Reconciliation: Reconciles Common Base against Agent A and Agent B changes.
• Conflict Markers & Journaling: Formats clean Git-style markers or returns structured conflict objects for automated LLM re-arbitration.
• Zero Dependencies: Pure Python standard library diff algorithms.

MCP Server Integration

python mcp_server.py

Available MCP Tools

• merge_3way: Merge two divergent agent modifications against an original base.
• detect_conflicts: Analyze whether two edits can be merged without collision.