gitwand
Auto-resolves Git merge conflicts so agents only touch the complex hunks.
Install
npmstdio
npx -y @gitwand/mcp Client config (Claude Desktop, Cursor, Windsurf and most MCP clients)
{
"mcpServers": {
"io-github-devlint-gitwand": {
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
} Source: official MCP Registry record · registry name io.github.devlint/gitwand · published 2026-09-09 · updated 2026-09-09. Not an endorsement; review the code before connecting it to anything sensitive.