Mergelock: open-source MCP server catches semantic merge conflicts git misses across parallel AI agents
ksadayamuthu · reddit · 2026-10-16
Developer ksadayamuthu open-sourced mergelock, a local MCP server + CLI targeting a pain point of running parallel coding agents (Claude Code, Cursor, Codex on separate branches): git reports a clean merge but the build breaks — e.g., one agent changes login()'s signature while another adds calls using the old one in a different file.
Two read-only MCP tools
- check: simulates a merge and returns a verdict (clean/warnings/conflict) with file:line locations and suggested fixes; catches signature changes with stale callers, deleted-but-used symbols, and duplicate function definitions.
- claims: lists work scopes other agents have declared to reveal overlap.
Setup: brew install sadayamuthu/tap/mergelock, then claude mcp add mergelock -- mergelock serve; a Stop hook blocks Claude Code completion while conflicting with main. Built in Go with tree-sitter and git merge-tree, supports TypeScript/JavaScript/Python, Apache-2.0, listed in the official MCP Registry.
More from coding & agent
- DIRECT: retrieval-based next-question suggestions for conversational agents — burkov · 2026-10-16
- Claude Code and Codex now autocomplete the user's next action — tokenbender · 2026-10-16
- Hermes Agent ships official Reverse Engineer Anything plugin with one-command setup — Teknium · 2026-10-16
- MLExpert: 35B MoE Agent Trained to Autonomously Handle Machine Learning Engineering — Shangheng Du · 2026-10-16
- Cowork-Gym: Alibaba Synthesizes 64.9K Agent Work Environments, Boosting Qwen by 8.7 Points — Anni Zou · 2026-10-16
- MMSearch-OPD: Joint RL and On-Policy Distillation for Long-Horizon Multimodal Search Agents — PekingUniversity · 2026-10-16