mergelock for Grok
io.github.sadayamuthu/mergelock
Finds merge conflicts git can't see between branches: changed signatures vs new callers.
client:Grok
transport:stdio
runtime:oci
Install mergelock in Grok
.mcp.json (in your project root)
{
"mcpServers": {
"mergelock": {
"type": "stdio",
"command": "docker",
"args": [
"run",
"-i",
"--rm",
"ghcr.io/sadayamuthu/mergelock:0.1.5"
]
}
}
}Grok Build reads Claude Code's .mcp.json and Claude Desktop's config unchanged, so a server you have already set up there needs nothing new. The Grok web app and X integration do not take custom servers. Grok docs