Skillget

genpark-agent-conflict-resolution-merger-skill

mcp
Security Audit
Warn
Health Warn
  • License — License: MIT
  • Description — Repository has a description
  • Active repo — Last push 0 days ago
  • Low visibility — Only 7 GitHub stars
Code Pass
  • Code scan — Scanned 3 files during light audit, no dangerous patterns found
Permissions Pass
  • Permissions — No dangerous permissions requested

No AI report is available for this listing yet.

SUMMARY

3-way operational transform / conflict resolution merger for multi-agent concurrent writes to code/documents with rollback journals

README.md

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.

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.

Reviews (0)

No results found