Home › Version Control › mergelock

mergelock

Finds merge conflicts git can't see between branches: changed signatures vs new callers.

Go Local macOSLinux
★ 2 stars Last pushed 2026-10-17 License: Apache-2.0

Topics: Version Control

Connect

Review any command before running it. Package names and URLs come from the server's own registry entry.

Package (oci)

docker run -i --rm ghcr.io/sadayamuthu/mergelock:0.1.5

Or add to your MCP client config:

{
  "mcpServers": {
    "mergelock": {
      "command": "docker",
      "args": [
        "run",
        "-i",
        "--rm",
        "ghcr.io/sadayamuthu/mergelock:0.1.5"
      ]
    }
  }
}

This server takes extra arguments — see its repository.

Related servers

Listed in punkpeye/awesome-mcp-servers (MIT)

Data from the Official MCP Registry