general MCP Server
GitWand automatically resolves trivial Git merge conflicts — the ones that waste your time but don't need human judgment. Think of it as PhpStorm's magic wand, everywhere.
Discovered via github-topic:mcp and last synced 3mo ago.
Install instructions not detected yet
Check the source repository for the latest setup steps.
Description
Member
Dry-run resolution — stats and risk assessment without writing files
Explain why a specific hunk was classified its type (full trace + context)
Description
Auto-resolve trivial conflicts, return DecisionTrace + pendingHunks
Throughput
Description
List conflicted files with their complexity and auto-resolvability
[Laurent Guitton](https://github.com/devlint)
Apply a custom (LLM-provided) resolution to a specific complex hunk
Ask the connected agent to propose a resolution for one pending hunk (ours/theirs/base + trace returned)
Validate an LLM-proposed resolution through the post-merge gate, then apply it to disk