gitwand_preview_merge
Dry-run resolution — stats and risk assessment without writing files
How to use it
gitwand_preview_merge is exposed by the GitWand MCP server. Add the server to your MCP client (Claude Desktop, Cursor, Windsurf and others), and the gitwand_preview_merge tool becomes available to the model automatically. See the full listing for setup details and every tool this server provides.
Install GitWand
npx @gitwand/cli resolveOther tools in GitWand (6)
Apply a custom (LLM-provided) resolution to a specific complex hunk
Explain why a specific hunk was classified its type (full trace + context)
Auto-resolve trivial conflicts, return DecisionTrace + pendingHunks
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
List conflicted files with their complexity and auto-resolvability