GitWand gitwand

developer-tools git git-client merge merge-conflicts rust tauri

Use this command to install GitWand:

winget install --id=Devlint.GitWand -e

GitWand is a free, open-source native Git client that automatically resolves trivial merge conflicts using 10 deterministic patterns — no guessing, no hallucinations. It covers the full daily Git workflow (changes, history, branches, PR review) and exposes its resolution engine as a CLI, a VS Code extension and an MCP server for AI agents. Built with Tauri 2 + Rust.