GitWand
未认领The Git client that actually resolves conflicts — 10 deterministic patterns auto-resolve the trivial 95%, full trace on the rest. Native (Tauri 2 + Rust), free, MIT.
appclidiffgitmcpmergetaurivuewebappclaude
安装
$
npx @gitwand/cli resolve工具（7 个）
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
gitwand_status
List conflicted files with their complexity and auto-resolvability