# Gitwand

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

Canonical: https://claudelist.com/listings/mcp-reg-io-github-devlint-gitwand-1b3ffc2b73

Category: MCP Servers

Source: community · devlint

Source checked: 2026-10-14

Website: https://www.claudemcp.org/mcp/registry/io-github-devlint-gitwand-1b3ffc2b73ed.html

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

## Install or set up

1. Review the publisher repository and npm package `@gitwand/mcp@3.12.3` before running it. The MCP Registry declares this package as a stdio server.
2. Install Node.js, then run the command below in your Claude Code project. Check the publisher README for any account or configuration requirements.
3. Restart Claude Code and use `/mcp` to confirm the connection and review its tools and permissions.

```sh
claude mcp add mcp-io-github-devlint-gitwand-1b3ffc -- npx -y @gitwand/mcp@3.12.3
```

Installation guide: https://github.com/devlint/GitWand