mergelock for VS Code
io.github.sadayamuthu/mergelock
Finds merge conflicts git can't see between branches: changed signatures vs new callers.
client:VS Code
transport:stdio
runtime:oci
Install mergelock in VS Code
.vscode/mcp.json
{
"servers": {
"mergelock": {
"type": "stdio",
"command": "docker",
"args": [
"run",
"-i",
"--rm",
"ghcr.io/sadayamuthu/mergelock:0.1.5"
]
}
}
}Requires agent mode. MCP: Open User Configuration puts the same block in every workspace. VS Code docs