gitwand for Claude Code

io.github.devlint/gitwand

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

client:Claude Code transport:stdio runtime:npm

Install gitwand in Claude Code

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