Gitwand
Gitwand is an MCP server that adds developer tools to AI assistants such as Claude Desktop, Claude Code and Cursor. Auto-resolves Git merge conflicts so agents only touch the complex hunks. It has 198 GitHub stars, is released under the MIT license and runs locally with npx -y @gitwand/mcp.
github.com/devlint/GitWand (opens in a new tab)
Data as of from the GitHub API and the official MCP registry; description from the project's repository. Report an error
Install Gitwand
Generated from the server's MCP registry entry. Replace your-value with your own values.
Claude Desktop
{
"mcpServers": {
"gitwand": {
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
}Settings > Developer > Edit Config. macOS: ~/Library/Application Support/Claude/, Windows: %APPDATA%\Claude\. Restart Claude Desktop afterwards.
Claude Code
claude mcp add --transport stdio gitwand -- npx -y @gitwand/mcpCursor
{
"mcpServers": {
"gitwand": {
"type": "stdio",
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
}Project file; use ~/.cursor/mcp.json to enable it in every project.
VS Code
{
"servers": {
"gitwand": {
"type": "stdio",
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
}Config formats checked against the official docs on Oct 7, 2026: modelcontextprotocol.io (opens in a new tab), code.claude.com (opens in a new tab), cursor.com (opens in a new tab), code.visualstudio.com (opens in a new tab).
Tools (7)
Parsed from the Tools section of the README; check the repository for the current list.
gitwand_statusList conflicted files with their complexity and auto-resolvability
gitwand_resolve_conflictsAuto-resolve trivial conflicts, return DecisionTrace + pendingHunks
gitwand_preview_mergeDry-run resolution — stats and risk assessment without writing files
gitwand_explain_hunkExplain why a specific hunk was classified its type (full trace + context)
gitwand_apply_resolutionApply a custom (LLM-provided) resolution to a specific complex hunk
gitwand_resolve_hunkAsk the connected agent to propose a resolution for one pending hunk (ours/theirs/base + trace returned)
gitwand_resolve_hunk_llmValidate an LLM-proposed resolution through the post-merge gate, then apply it to disk
About Gitwand
A fast, native Git client with built-in smart conflict resolution Desktop • Conflict engine • CLI • MCP Server • Architecture • Roadmap • Code signing
- app
- cli
- diff
- git
- mcp
- merge
- tauri
- vue
- webapp
- claude
Similar MCP servers
More developer tools MCP servers
paper-preflight
amos689/paper-preflight
Checks every LaTeX reference against Crossref, dblp, arXiv, DataCite, PubMed and OpenAlex.
Too new to judge · created Oct 3, 2026
Developer toolsPythonSanity
sanity-io/agent-toolkit
Gives AI agents direct access to your Sanity projects and guidance for working with them.
Maintained · last commit Oct 27, 2026
OfficialDeveloper toolsJavaScriptLabWired
w1ne/labwired-core
Design circuits, simulate and verify embedded firmware, and lay out PCBs with AI agents.
Active · last commit Nov 16, 2026
Developer toolsRustmcp-debugger
debugmcp/mcp-debugger
Step-through debugging for AI agents: breakpoints, stepping and live variables in ten languages.
Active · last commit Nov 15, 2026
OfficialDeveloper toolsTypeScriptmelta UI
tsubotax/melta-ui
AI-Ready design system MCP: melta UI tokens, component contracts, 107 rules, check_html self-verify.
Maintained · last commit Oct 10, 2026
Developer toolsTypeScriptGodot MCP
satelliteoflove/godot-mcp
Agent-driven Godot playtesting: editor control, input injection, game-time stepping, live state.
Active · last commit Nov 11, 2026
Developer toolsGDScript
How do I install the Gitwand MCP server?
Add the command npx -y @gitwand/mcp to your MCP client: put it in claude_desktop_config.json for Claude Desktop, run claude mcp add for Claude Code, or add it to .cursor/mcp.json (Cursor) or .vscode/mcp.json (VS Code). The snippets on this page are ready to paste.
Is Gitwand free?
The server is open source under the MIT license, so running it is free. It does not declare any required API key.
Is Gitwand actively maintained?
The most recent commit was on Nov 12, 2026. The latest release is v3.13.1, published Nov 12, 2026. appsgit only lists MCP servers with a commit in the last six months.