The Git client that actually resolves conflicts: 8 deterministic patterns auto-resolve the ones that were never decisions, full trace on the rest. Native (Tauri 2 + Rust), free, MIT.
Latest release v3.12.5 — GitWand v3.12.5 · 3 Nov 2026
13 files for Claude Code, Codex and OpenCode: gitwand-executor, gitwand-planner, gitwand-verifier, preview and 9 more — 4,276 tokens loaded in every session.
AGENTS.md A 3,135 tok CLAUDE.md A 1,141 tok .claude/settings.json A — .claude/skills/add-pattern/SKILL.md A 59 tok .claude/skills/add-resolver/SKILL.md A 90 tok .claude/skills/add-tauri-command/SKILL.md A 50 tok .claude/skills/i18n-sync/SKILL.md A 75 tok .claude/skills/release/SKILL.md A 64 tok .claude/agents/gitwand-executor.md A 43 tok .claude/agents/gitwand-planner.md A 54 tok .claude/agents/gitwand-verifier.md A 59 tok These files are devlint/GitWand's own configuration — they tell Claude Code, Codex and OpenCode how to work on this repository, so they are not mods to install elsewhere. Copy one as a starting point and replace the parts that are about this project.