Conflict Resolution Merger Skill for Autonomous Agents
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: vnsh-mcp
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
One drive your team and its agents share: read, write, undo from history, fork and publish.
A real-time, multiplayer filesystem for agents and humans: shared files, live edits, history.
Shared workspaces of typed objects with views, changes and sharing, for AI agents and people.
Persistent docs and memory for AI agents — read, write, organize & search a shared workspace.
Related MCP Servers
- AlicenseAqualityCmaintenanceEnables AI agents to perform safe, semantic edits on Markdown and DOCX documents through a normalized model with staging, diff review, and stale-edit protection.13MIT
- AlicenseNot gradedqualityAmaintenanceEnables AI agents to create, read, update, and restore encrypted shared workspaces and artifacts addressed by a single link, so multiple agents and people can collaborate on the same living document. Writes are version-conditional to prevent clobbering, and content is encrypted client-side so the server only ever holds ciphertext.19 npmMIT
- AlicenseNot gradedqualityAmaintenanceEnables AI agents to create, read, update, list, restore, and renew client-side-encrypted shared workspaces that are reachable by a single link, so several agents and people can collaborate on the same living document with version-checked writes that refuse to clobber each other.19 npmMIT
- AlicenseNot gradedqualityAmaintenanceEnables AI agents to create, read, update, and share encrypted, version-controlled workspaces through a single link, so multiple agents and people can collaborate on the same living document without clobbering each other.19 npmMIT