gitwand — Claude Code MCP server: what it does, how to install
gitwand automatically handles straightforward Git merge conflicts and leaves harder hunks for the agent. Use it when branch merges need conflict triage.
claude mcp add gitwand -- npx -y @gitwand/mcpWhat gitwand does
gitwand gives an agent an MCP server for automatic handling of simple Git merge conflicts. More involved hunks stay with the agent, so the tool separates routine conflict work from cases that need closer review.
The server runs from the @gitwand/mcp package through npx. For a repository with mixed conflict difficulty, that means routine hunks can be handled automatically while complex ones remain under review. The MCP server will not connect unless it is started with npx -y @gitwand/mcp.
The Claude Code setup registers the server under the name gitwand. Once connected, the agent can use it while working with conflicts in the current Git project.
What it helps with
- resolve straightforward Git conflict hunks
- leave complex conflict hunks for agent review
- triage conflicts after merging branches
- connect automatic conflict handling to Claude Code
Example prompts for the agent
- Review the current Git conflict, resolve the straightforward parts, and leave complex hunks for me.
- After merging these branches, separate conflicts that can be handled automatically from those that need manual review.
- Use gitwand to process the simple conflict sections in this Git project.
How to install gitwand
Platform CLI
claude mcp add gitwand -- npx -y @gitwand/mcpPlatform CLI
codex mcp add gitwand -- npx -y @gitwand/mcpConfig file
{
"mcpServers": {
"gitwand": {
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
}Config file
{
"servers": {
"gitwand": {
"type": "stdio",
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
}Platform CLI
gemini mcp add gitwand npx -y @gitwand/mcpStep by step, with commands for each platform: How to add an MCP server to Claude Code, Codex, Cursor, VS Code, Gemini CLI and more
Questions about gitwand
How do I install gitwand in Claude Code?
Run claude mcp add gitwand -- npx -y @gitwand/mcp. This registers the MCP server as gitwand.
What does gitwand do?
gitwand automatically handles simple Git merge conflicts and leaves complex hunks for the agent to review.
Can gitwand resolve every Git conflict automatically?
No. It handles straightforward conflicts automatically, while complex hunks remain for agent review.
