GI

Gitwand

io.github.devlint/gitwand

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

Yes, if you run it on your computer.This is a local server: your AI app launches it on your machine (Claude Desktop, Cursor, VS Code, Claude Code). Browser-only apps like ChatGPT on the web can't run it.

Connect it

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

Alternatives in Developer Tools

Compare →
Try “Notion”, “Stripe”, “create invoice”, “browser”