Skip to main content
Glama
Conflict Resolution Merger Skill for Autonomous Agents

Conflict Resolution Merger Skill for Autonomous Agents

by Alpha-Park

Conflict Resolution Merger Skill for Autonomous Agents

MCP Compatible Python 3.9+ License: MIT Zero External Dependencies

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.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.

Tool Schema Changelog

Recent tool additions, removals, and schema changes observed during successful MCP inspections.

Loading tool schema changelog…

    Related MCP Connectors

    Related MCP Servers

    • A
      license
      A
      quality
      C
      maintenance
      Enables 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
    • A
      license
      Not graded
      quality
      A
      maintenance
      Enables 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 npm
      MIT
    • A
      license
      Not graded
      quality
      A
      maintenance
      Enables 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 npm
      MIT
    • A
      license
      Not graded
      quality
      A
      maintenance
      Enables 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 npm
      MIT