Gitwand
Exposes GitWand's conflict resolution engine to Claude and other MCP clients, letting agents merge branches and resolve conflicts programmatically. The server automatically handles trivial conflicts using GitWand's pattern registry (same change on both sides, one-side-only edits, non-overlapping additions, whitespace differences) and surfaces only the complex hunks that need human judgment. Each resolution includes a composite confidence score with dimensions for type classification, data risk, and scope impact. Useful when you want an agent to handle branch operations or prepare merges in a Git workflow without getting stuck on mechanical conflicts. The engine runs the same diff3-aware classifier that powers the desktop app's merge preview feature.
- GitHub stars
- 196
- tools
- 7
- transport
- STDIO
- last updated
- Nov 12, 2026
Tools
7 toolsPublic tool metadata for what this MCP can expose to an agent.
gitwand_statusList conflicted files with their complexity and auto-resolvability
List conflicted files with their complexity and auto-resolvability
No parameter schema in public metadata yet.
gitwand_resolve_conflictsAuto-resolve trivial conflicts, return DecisionTrace + pendingHunks
Auto-resolve trivial conflicts, return DecisionTrace + pendingHunks
No parameter schema in public metadata yet.
gitwand_preview_mergeDry-run resolution — stats and risk assessment without writing files
Dry-run resolution — stats and risk assessment without writing files
No parameter schema in public metadata yet.
gitwand_explain_hunkExplain why a specific hunk was classified its type (full trace + context)
Explain why a specific hunk was classified its type (full trace + context)
No parameter schema in public metadata yet.
gitwand_apply_resolutionApply a custom (LLM-provided) resolution to a specific complex hunk
Apply a custom (LLM-provided) resolution to a specific complex hunk
No parameter schema in public metadata yet.
gitwand_resolve_hunkAsk the connected agent to propose a resolution for one pending hunk (ours/theirs/base + trace returned)
Ask the connected agent to propose a resolution for one pending hunk (ours/theirs/base + trace returned)
No parameter schema in public metadata yet.
gitwand_resolve_hunk_llmValidate an LLM-proposed resolution through the post-merge gate, then apply it to disk
Validate an LLM-proposed resolution through the post-merge gate, then apply it to disk
No parameter schema in public metadata yet.
Sponsors
Agent CaffeineSponsoredClose your lid, come back to finished work
SnugSponsoredThe clipboard manager for the AI eraPromote your product hereReach 125k+ visitors monthly
WaxSponsoredBlock anything with supervision, without erasing your iPhonePromote your product hereReach 125k+ visitors monthly
knobsSponsoredSee your site on any phone, any day, in any languageReadme
GitWand
GitWand
A fast, native Git client with built-in smart conflict resolution
Desktop • Conflict engine • CLI • MCP Server • Architecture • Roadmap • Code signing
Details
- Repository
- github.com/devlint/gitwand
- Category
- Developer Tools
- Package
@gitwand/mcp- Transport
- STDIO
- Registry
- MCP registry, active
Related Developer Tools MCP servers
View all
GistPad MCPlostintangent/gistpad-mcp📓 An MCP server for managing your personal knowledge, daily notes, and re-usable prompts via GitHub Gists192stars
Backlognulab/backlog-mcp-serverProvides an MCP bridge to Backlog APIs for projects, issues, wikis, Git, and notifications.185stars
jevmemavinash-jetwani/jevmemShared project rules and memory for AI coding agents: a JEVMEM.md in git, with a command guard.148stars
Memory Mcpyuvalsuede/memory-mcpPersistent memory + git snapshots for Claude Code. Never lose context or code.97stars
Join Cloudkushneryk/join.cloudCollaboration rooms for AI agents. Real-time messaging + standard git.64stars
Greadnitrorcr/greadAn MCP server that gives your AI access to the source code and docs of all public github repos54stars