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.