Gitwand

MCP server devlint/GitWand/io.github.devlint/gitwand

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

InstallClaude Code

claude mcp add gitwand -- npx -y @gitwand/mcp

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

Keep looking

MCP servers are one crate of 328,083. Ordering is by how many stacks a row turns up in, so the top of any crate is what has actually been picked rather than what has the most stars.