gitwand MCP
v3.10.1io.github.devlint/gitwand
Auto-resolves Git merge conflicts so agents only touch the complex hunks.
transport:stdio
runtime:npm
Target client
run in your project directory
claude mcp add gitwand -- npx -y @gitwand/mcp
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.