gitwand for Windsurf

io.github.devlint/gitwand

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

client:Windsurf transport:stdio runtime:npm

Install gitwand in Windsurf

~/.codeium/windsurf/mcp_config.json · windows: %USERPROFILE%\.codeium\windsurf\mcp_config.json

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

Global only — Windsurf has no per-project MCP config. Refresh Cascade after saving. Windsurf docs