Community

io.github.devlint/gitwand

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

Install

Add the config to your client settings. Replace values in <angle brackets> with your own.

claude_desktop_config.json

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