io.github.devlint/gitwand
Auto-resolves Git merge conflicts so agents only touch the complex hunks.
Target client
run in your project directory
claude mcp add gitwand -- npx -y @gitwand/mcpsetup guides: Claude Code Claude Desktop Cursor VS Code Zed Windsurf Cline Gemini CLI Grok LangChain
Adds it for this project only. Append --scope user to make it available everywhere. Claude Code docs
This listing does not declare its tools. Connect the server and your client will discover them on the handshake.