Catch merge conflicts git can't see between parallel AI agent branches: changed signatures vs new callers, deleted symbols still in use. TS/JS/Python. CLI + MCP server.
Setup
Choose your client, copy the config, then fill in any required environment variables.
claude mcp add mergelock -- docker run -i --rm ghcr.io/sadayamuthu/mergelock:0.1.5~/.codex/config.toml
[mcp_servers.mergelock]
command = "docker"
args = ["run", "-i", "--rm", "ghcr.io/sadayamuthu/mergelock:0.1.5"]
# codex mcp add mergelock -- docker run -i --rm ghcr.io/sadayamuthu/mergelock:0.1.5~/.cursor/mcp.json
{
"mcpServers": {
"mergelock": {
"command": "docker",
"args": [
"run",
"-i",
"--rm",
"ghcr.io/sadayamuthu/mergelock:0.1.5"
]
}
}
}.vscode/mcp.json
{
"servers": {
"mergelock": {
"type": "stdio",
"command": "docker",
"args": [
"run",
"-i",
"--rm",
"ghcr.io/sadayamuthu/mergelock:0.1.5"
]
}
}
}~/.gemini/settings.json
{
"mcpServers": {
"mergelock": {
"command": "docker",
"args": [
"run",
"-i",
"--rm",
"ghcr.io/sadayamuthu/mergelock:0.1.5"
]
}
}
}claude_desktop_config.json
{
"mcpServers": {
"mergelock": {
"command": "docker",
"args": [
"run",
"-i",
"--rm",
"ghcr.io/sadayamuthu/mergelock:0.1.5"
]
}
}
}.trae/mcp.json
{
"mcpServers": {
"mergelock": {
"command": "docker",
"args": [
"run",
"-i",
"--rm",
"ghcr.io/sadayamuthu/mergelock:0.1.5"
]
}
}
}