Skip to main content
Glama
Sign In
Conflict Resolution Merger Skill

Conflict Resolution Merger Skill

by alphaparkinc
OverviewSchemaSourceRelated ServersDiscussionsAdmin
Python
Remote

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: cafecito

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.

This server cannot be deployed

Claude Code, inside the Godot 4 editorFlockbay puts an AI agent in the real Godot 4 editor: it writes GDScript, runs your game and fixes what breaks. Free, or bring your own Claude Code or Codex.flockbay.comAd

Resources

Related MCP Connectors

Related MCP Servers

  • LockRe

    crsxmd
    A
    license
    Not graded
    quality
    B
    maintenance
    LockRe prevents file edit collisions among multiple AI agents and allows surgical revert of each agent's changes line-by-line, without affecting others' work.
    1
    MIT
  • cafecito

    cafecitoofficial

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

  • snapedit

    rianprei
    A
    license
    Not graded
    quality
    C
    maintenance
    Snapshot-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.
    2
    MIT

  • DPR MCP Server

    Janani879
    A
    license
    B
    quality
    C
    maintenance
    Enables 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.
    35
    MIT