io.github.sadayamuthu/mergelock
Finds merge conflicts git can't see between branches: changed signatures vs new callers.
Target client
run in your project directory
claude mcp add mergelock -- docker run -i --rm ghcr.io/sadayamuthu/mergelock:0.1.5
setup guides: Claude Code Claude Desktop Cursor VS Code Zed Windsurf Cline Gemini CLI Grok LangChain
Adds it for this project only. Append --scope user to make it available everywhere. Claude Code docs
This listing does not declare its tools. Connect the server and your client will discover them on the handshake.