GitWand
ClaimedThe Git client that actually resolves conflicts — 10 deterministic patterns auto-resolve the trivial 95%, full trace on the rest. Native (Tauri 2 + Rust), free, MIT.
Set up this server
01 / Choose your client
02 / Before you connect
Authentication is not specified. Check the project instructions before connecting.
Project instructions03 / Add the configuration
claude mcp add --transport stdio 'gitwand' -- 'npx' '-y' '@gitwand/cli' 'resolve'04 / Check it in your client
Open your client’s MCP settings and confirm the server connects and lists its tools. A copied configuration does not confirm a working connection.
More in Developer Tools
Browse the full directoryBadge
Show this listing on your README and website
Get verified and your listing links back to your site with a do-follow link. The badge is optional while first-100 launch spots remain.
Security profile
Exposure: Broad
Reaches into the environment, credential files or other agents' configuration.
What this server can reach, from a static read of the shipped code. Nothing was executed and nothing here is a verdict: a browser tool has to run commands and an API wrapper has to call its API. Decide what fits your setup.
Detected
- Talks to external services
Makes outbound requests. The hosts are listed so you can see where data goes.
api.anthropic.com, api.bitbucket.org, api.github.com, api.openai.com
- Reads environment variables in bulk
Copies or enumerates the whole environment, which can include keys meant for other tools.
- Contains instructions aimed at AI agents
Text in code or agent-facing files that steers a model. Worth reading before you trust it.
- Passes model output on without checks
Model output reaches HTML, SQL or a shell without validation.
- Runs unpinned packages at runtime
Executes npx or uvx without a version, so a compromised upstream release would run.
Dependencies with known advisories
None found in the lockfiles and manifests checked against OSV.dev.
Left out of the profile
33 pattern matches in documentation, configuration or CI files were recorded but are not part of the profile, because they do not run when the server does. The owner dashboard lists them.
7 of 7 tools
Documented tools (7)
From project documentation. A server handshake does not verify each tool’s description or behavior.
gitwand_apply_resolution
Apply a custom (LLM-provided) resolution to a specific complex hunk
gitwand_explain_hunk
Explain why a specific hunk was classified its type (full trace + context)
gitwand_preview_merge
Dry-run resolution — stats and risk assessment without writing files
gitwand_resolve_conflicts
Auto-resolve trivial conflicts, return DecisionTrace + pendingHunks
gitwand_resolve_hunk
Ask the connected agent to propose a resolution for one pending hunk (ours/theirs/base + trace returned)
gitwand_resolve_hunk_llm
Validate an LLM-proposed resolution through the post-merge gate, then apply it to disk
gitwand_status
List conflicted files with their complexity and auto-resolvability
Tool change history
FAQ
Questions about GitWand MCP Server
- How do I connect GitWand MCP Server to Claude?
- Run `claude mcp add gitwand -- npx -y @gitwand/cli resolve` in Claude Code, or add the same command and arguments under mcpServers in Cursor's mcp.json or Claude Desktop's claude_desktop_config.json, then restart the client. The blocks above are ready to paste.
- Is GitWand MCP Server free?
- The listed licence is MIT. Check the upstream terms for permitted use and commercial requirements; a public repository does not by itself mean the software is free or open source. Connected APIs and hosted services may have separate charges.
- What can GitWand MCP Server do?
- GitWand MCP Server documents 7 tools to the agent, including gitwand_apply_resolution, gitwand_explain_hunk, gitwand_preview_merge. The descriptions above come from project documentation. A live handshake does not test individual tool behavior.