mergelock for Claude Code
io.github.sadayamuthu/mergelock
Finds merge conflicts git can't see between branches: changed signatures vs new callers.
client:Claude Code
transport:stdio
runtime:oci
Install mergelock in Claude Code
run in your project directory
claude mcp add mergelock -- docker run -i --rm ghcr.io/sadayamuthu/mergelock:0.1.5Adds it for this project only. Append --scope user to make it available everywhere. Claude Code docs