Skip to content
mcp/harbor
Cline

mergelock for Cline

io.github.sadayamuthu/mergelock

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

client:Cline transport:stdio runtime:oci

Install mergelock in Cline

~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json · windows: %APPDATA%\Code\User\globalStorage\saoudrizwan.claude-dev\settings\cline_mcp_settings.json 

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

Cline's MCP Servers pane edits this file for you if you would rather not find it. Cline docs

mergelock in other clients

mergelock MCP server