Skip to content
mcp/harbor
Gemini CLI

mergelock for Gemini CLI

io.github.sadayamuthu/mergelock

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

client:Gemini CLI transport:stdio runtime:oci

Install mergelock in Gemini CLI

~/.gemini/settings.json · windows: %USERPROFILE%\.gemini\settings.json 

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

Gemini expands $VAR and ${VAR} inside env values, so a secret can live in your shell rather than this file. Gemini CLI docs

mergelock in other clients

mergelock MCP server