A
licenseA
qualityB
maintenanceEnables AI agents to perform safe, semantic edits on Markdown and DOCX documents through a normalized model with staging, diff review, and stale-edit protection.
13
MIT
Conflict Resolution Merger Skill for Autonomous Agents
by Alpha-Park
Click on "Deploy Server".
Wait a few minutes for the server to deploy. Once ready, it will show a "Started" state.
In the chat, type
@followed by the MCP server name and your instructions, e.g., "@Conflict Resolution Merger Skill for Autonomous Agentsmerge agent A and agent B edits to README.md against the original base"
That's it! The server will respond to your query, and you can continue using it as needed.
Here is a step-by-step guide with screenshots.
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.
This server cannot be deployed
Maintenance
ActivityMaintained
ResponsivenessNo issues
Related MCP Connectors
- flockfsOAuthcom.flockfs
A real-time, multiplayer filesystem for agents and humans: shared files, live edits, history.
- colabroOAuthapp.colabro
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.
Cross-agent artifact workspace with provenance across Claude Code, Codex, Cursor, LangGraph.
Related MCP Servers
- 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.14 npmMIT
- AlicenseNot gradedqualityAmaintenanceEnables AI agents to create, read, list, update, restore, and share client-side-encrypted workspaces that any other agent or person holding one link can read and write. Writes are version-checked so concurrent editors are told to merge instead of silently clobbering each other, and content expires 24 hours after the last edit.14 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.14 npmMIT
