sadayamuthu/mergelock
by Various
Catch merge conflicts git can't see between parallel AI agent branches: changed signatures vs new callers, deleted symbols still in use. TS/JS/Python. CLI + MCP server.
MCP
sadayamuthu/mergelock
Added 18 Oct 2026
Overview
Detects semantic merge conflicts that git's textual diff misses, such as changed function signatures with existing callers or deleted symbols still referenced. Supports TypeScript, JavaScript, and Python. Provides both a command-line interface and an MCP server for integration with AI agent workflows.
Best for
Best for
Teams running parallel AI agent branches on TypeScript, JavaScript, or Python codebases
Use cases
- Catching broken callers after signature changes in parallel branches
- Finding references to deleted symbols before merging AI agent branches
- Integrating merge checks into MCP-based agent tooling
Notes
2 stars on GitHub. Last updated 2026-10-17. Licensed Apache-2.0.
Pros
- Catches conflicts git cannot see
- Works across TS/JS and Python
- Offers both CLI and MCP server for flexible integration
Cons
- Limited to TS/JS and Python, no other languages
- Low adoption (2 stars) suggests early-stage maturity
- Only detects specific conflict types, not all semantic issues
Get the free Developer’s Field Guide
A 27-page field guide to the AI coding workflow with Claude. Claude Code, MCP servers, the prompt patterns that work, and what to delegate. Free.
Enter your work email. We send it straight over, plus a few short notes worth knowing. Unsubscribe any time.