Gitwand
Let your coding agent auto-resolve routine merge conflicts in Git so you only review the hard hunks.
Overview
GitWand is a MCP server for the Build phase that auto-resolves Git merge conflicts so agents only edit the complex hunks.
What is this MCP server?
- Auto-resolves Git merge conflicts before the agent edits files
- Surfaces only complex hunks that need human or agent judgment
- Stdio MCP via npm package @gitwand/mcp (v2.9.0)
- stdio transport for Claude Code, Cursor, and other MCP hosts
- Server version 2.9.0
Community signal: 98 GitHub stars.
What problem does it solve?
Agents waste tokens and risk corrupting files when every merge conflict requires manual resolution across the whole diff.
Who is it for?
Solo builders using Claude Code or Cursor on active feature branches who merge often and want Git-aware MCP tooling.
Skip if: Teams that forbid automated conflict resolution policy or workflows that rarely use merge commits.
What do I get? / Deliverables
Routine conflicts clear automatically and your agent focuses on the hunks that actually need judgment.
- Automated resolution of routine merge hunks
- Reduced conflict surface for agent edits
Recommended MCP Servers
Journey fit
Merge resolution happens while you are actively integrating branches and shipping code changes—the core Build phase. Git MCP tooling plugs into your agent workflow alongside repos and CI, which Skillselion shelves under integrations.
How it compares
Git-focused MCP integration, not a general debugging or code-review agent skill.
Common Questions / FAQ
Who is GitWand for?
Indie developers and agent users who merge frequently and want merge conflicts narrowed to the hard parts before the model edits the repo.
When should I use GitWand?
During Build when you pull or merge and conflict markers would otherwise force the agent to resolve entire files line by line.
How do I add GitWand to my agent?
Register the stdio MCP server @gitwand/mcp from npm in your host’s MCP config (Claude Code, Cursor, etc.) pointing at the published package v2.9.0.