Conflict Resolution Merger Skill
This server does not currently have a deployable release on Glama. Follow the repository's setup instructions to install and configure it for your MCP client, including any required credentials and local dependencies.
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.
Related MCP server: cafecito
MCP Server Integration
python mcp_server.pyAvailable MCP Tools
merge_3way: Merge two divergent agent modifications against an original base.detect_conflicts: Analyze whether two edits can be merged without collision.
Tool Schema Changelog
Recent tool additions, removals, and schema changes observed during successful MCP inspections.
Loading tool schema changelog…
Related MCP Connectors
A real-time, multiplayer filesystem for agents and humans: shared files, live edits, history.
Cork is the multiplayer layer that keeps concurrent AI agents from stepping on each other in a shared codebase. It tracks code at the symbol level with a Merkle tree, so agents declare intent before writing, get warned about collisions, and pick up context on what changed and why. It also carries anchored team memory, merge simulation, and an audit ledger of every agent action.
Source control for coding agents: declare an intent, settle overlaps before code, verify each push.
Shared memory for teams and their AI agents: Markdown concepts with typed links in shared bundles.
Related MCP Servers
- AlicenseNot gradedqualityBmaintenanceLockRe prevents file edit collisions among multiple AI agents and allows surgical revert of each agent's changes line-by-line, without affecting others' work.1MIT

cafecitoofficial
AlicenseNot gradedqualityCmaintenanceEnables AI agents to coordinate on a shared repository using commutativity-proven parallel landing and regenerative merge, avoiding rebase conflicts through symbol-level leases.Apache 2.0- AlicenseNot gradedqualityCmaintenanceSnapshot-based file editing for AI agents. Enables safe file edits by sending only new content against immutable, content-addressed snapshots with 3-way merging and ambiguity protection.2MIT
- AlicenseBqualityDmaintenanceEnables safe, human-in-the-loop AI document collaboration by letting agents create isolated workspaces, edit tracked files, open reviewable Change Requests, and get human approval before merging, with Git-backed conflict detection and resolution.35MIT