mergelock for Claude Desktop
io.github.sadayamuthu/mergelock
Finds merge conflicts git can't see between branches: changed signatures vs new callers.
client:Claude Desktop
transport:stdio
runtime:oci
Install mergelock in Claude Desktop
~/Library/Application Support/Claude/claude_desktop_config.json · windows: %APPDATA%\Claude\claude_desktop_config.json
{
"mcpServers": {
"mergelock": {
"command": "docker",
"args": [
"run",
"-i",
"--rm",
"ghcr.io/sadayamuthu/mergelock:0.1.5"
]
}
}
}Settings → Developer → Edit Config opens this file. Restart the app after saving. Claude Desktop docs