gitwand for Gemini CLI

io.github.devlint/gitwand

Auto-resolves Git merge conflicts so agents only touch the complex hunks.

client:Gemini CLI transport:stdio runtime:npm

Install gitwand in Gemini CLI

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

{
  "mcpServers": {
    "gitwand": {
      "command": "npx",
      "args": [
        "-y",
        "@gitwand/mcp"
      ]
    }
  }
}

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