GitWand MCP
An MCP server for Git merge conflicts: it resolves the trivial cases itself and leaves the complex hunks to the agent
- 194 ★ on the repository
- Last commit
Extended access
Why this level
- Some tools write resolutions into the conflicted repository files
- The server reads the Git working tree and needs no network or secrets
Install
- Works in
In your terminal, with SkillFoxx CLI
npx skillfoxx add mcp/gitwand-mcpDetects the agents on your machine, shows the access level and pins the version.
Other ways to install
Access and checks
How we reviewExtended accessThe tool runs code or makes network calls and only reads external data.
- Some tools write resolutions into the conflicted repository files
- The server reads the Git working tree and needs no network or secrets
This is third-party code. Review the repository files before installing.
What it does
The server from the `@gitwand/mcp` package gives the agent the GitWand conflict resolution engine. The agent sees the conflicted files and the share the engine can settle alone, then works through them step by step. `gitwand_preview_merge` checks the merge without writing and counts how many conflicts will resolve, `gitwand_resolve_conflicts` settles the unambiguous hunks and returns the rest as pending, `gitwand_explain_hunk` shows the decision trace for one hunk: our side, theirs, base and the reasoning. The engine tags each hunk with a pattern and a confidence score from 0 to 100. It resolves identical edits on both sides, one-sided changes, additions in different places, whitespace edits, reorders, value updates and generated files automatically. Overlapping edits are never resolved without the agent. JSON, Markdown, YAML, Vue and lockfiles have dedicated resolvers. Policy comes from a `.gitwandrc` file in the repository root.
Who it is for. Developers whose branch merges stall on conflicts, and those who hand conflict resolution to Claude Code or Cursor.
Good fit when
- After `git merge` or `git rebase` dozens of files carry conflict markers and most of them are trivial
- Before a merge you want to know how many conflicts resolve automatically and where the complex hunks will be
- The agent proposed a resolution for a disputed hunk and it must be checked for leftover markers and JSON or YAML syntax
- Conflicts keep landing in lockfiles and generated files, and a `.gitwandrc` rule resolves them more simply
Not a fit when
- Hard semantic conflicts: the server does not resolve overlapping edits, an agent or a person reads and decides them
- You want a full Git client with history and diff browsing: the project ships a separate desktop app for that
- A repository with no conflicts: the tools have nothing to do
Example request
After merging `feature/billing` into `main` the repository still has conflicts. Use GitWand to show how many resolve automatically, resolve the obvious ones and walk through the rest one by oneMCP
- Transport
- stdio
- Authentication
- not required
Limitations
- The server works on a local repository and uses the current directory by default. Another repository is set with `--cwd`.
- `gitwand_resolve_conflicts` and `gitwand_apply_resolution` write resolutions to files, so run merges on a clean branch.
- `gitwand_resolve_hunk` resolves nothing itself: it builds a prompt that the connected agent answers.
- Hunks with a low confidence score come back as pending, and an agent or a person still reads them.
How to disable. Run `claude mcp remove gitwand`. In Claude Desktop and Cursor delete the gitwand entry from the `mcpServers` block. The `.gitwandrc` file can stay or go.
FAQ
How do I connect GitWand to Claude Code?
Run `claude mcp add gitwand -- npx -y @gitwand/mcp`. There is no separate install: the package runs through `npx`.
Which conflicts does GitWand resolve itself?
Identical edits on both sides, one-sided changes, additions in different places, whitespace, reorders, value updates and generated files. Overlapping edits are left to the agent.
Does it need a separate model key?
No. `gitwand_resolve_hunk` hands a prompt to the connected agent, and the server itself calls no models and stores no keys.
How do I limit resolutions by policy?
Put a `.gitwandrc` in the repository root with a `policy` field and `patternOverrides` rules, for example for `*.lock` or `CHANGELOG.md`.
How does the server differ from the GitWand desktop app?
The same engine without the interface: the agent calls tools over MCP. The app adds history, a commit tree and pull request review.
Discussion
No questions or reviews yet.
Related
MCP serversLocal review of agent changes before commit: the agent itself reads line comments and replies to them through MCP.
GitVerse MCP: code review and PRs
GitVerse MCP Server
A GitVerse MCP server with 25 bitbucket-mcp-style tools: pull requests, inline code review with verdicts and running GitVerse Actions CI pipelines
A CLI and MCP server where parallel coding agents declare what they will change and see intent conflicts before any code
A Rust git worktree manager with a TUI: it creates the branch, copies files, runs setup and shows where an AI agent works
An MCP server for GitLab and self-hosted instances: projects, merge requests, issues, pipelines, wiki and releases
GitFlic MCP built on gitflic-cli
gitflic-cli MCP-сервер
An MCP server with 76 typed tools over a GitFlic CLI: merge requests, issues, releases, package registry, with group filters and a read-only mode
README in short
The package file opens with `npx` install and configs for Claude Desktop, Claude Code, Cursor and Windsurf. A table of seven tools follows, then the loop between agent and engine and the list of resolution patterns with confidence levels. It closes with the `.gitwandrc` policy file.