Skip to content
mcp/harbor
Zed

mergelock for Zed

io.github.sadayamuthu/mergelock

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

client:Zed transport:stdio runtime:oci

Install mergelock in Zed

~/.config/zed/settings.json · windows: %APPDATA%\Zed\settings.json 

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

Merge this into your existing settings object — do not replace the file. Zed docs

mergelock in other clients

mergelock MCP server