gitwand_status

MCP tool from GitWand by devlint

List conflicted files with their complexity and auto-resolvability

How to use it

Project documentation lists gitwand_status for the GitWand MCP server. Add the server to your MCP client (Claude Desktop, Cursor, Windsurf and others), then check which tools your installed version makes available. Tool availability can depend on configuration and credentials. A server handshake does not verify this tool’s behavior. See the full listing for setup details.

Install GitWand

$npx @gitwand/cli resolve

FULL GITWAND LISTING

Other tools in GitWand (6)

gitwand_apply_resolution

Apply a custom (LLM-provided) resolution to a specific complex hunk

gitwand_explain_hunk

Explain why a specific hunk was classified its type (full trace + context)

gitwand_preview_merge

Dry-run resolution — stats and risk assessment without writing files

gitwand_resolve_conflicts

Auto-resolve trivial conflicts, return DecisionTrace + pendingHunks

gitwand_resolve_hunk

Ask the connected agent to propose a resolution for one pending hunk (ours/theirs/base + trace returned)

gitwand_resolve_hunk_llm

Validate an LLM-proposed resolution through the post-merge gate, then apply it to disk