GitWand

Spec sheet

What it does

GitWand is a native Git client that combines repository workflow tools with deterministic merge-conflict resolution.Read 15 Oct 2026 · gitwand.app

Product

GitWand is a native Git client with desktop, CLI, and VS Code interfaces.Read 7 Oct 2026 · gitwand.app

Platforms

The desktop app is available for macOS, Linux, and Windows; GitWand also provides a CLI and VS Code extension.Read 7 Oct 2026 · gitwand.app

Support

GitHub Sponsors funds GitWand development time and hosting.Read 7 Oct 2026 · gitwand.app

AI and agents

GitWand offers an MCP server for AI clients including Claude Code, Cursor, and Windsurf; AI conflict resolution is opt-in.Read 7 Oct 2026 · gitwand.app

AI provider choice

For optional LLM fallback, users configure a provider such as Claude, an OpenAI-compatible endpoint, Ollama, or MCP, and use their own key or endpoint.Read 7 Oct 2026 · gitwand.app

AI providers

AI features can use Claude Code locally, Anthropic’s API, or any OpenAI-compatible endpoint including Azure OpenAI, OpenRouter and self-hosted services.Read 15 Oct 2026 · gitwand.app

API stability

The npm package warns that its pre-1.0 API has no formal semver stability commitment and advises consumers to pin an exact version.Read 15 Oct 2026 · npmjs.com

CLI

The CLI runs through npx or npm, requires Node.js 18 or newer, supports dry-run and verbose modes, and emits CI-oriented JSON with semantic exit codes.Read 15 Oct 2026 · npmjs.com

CLI package activity

The npm CLI page showed version 3.10.1, 54 versions and 418 weekly downloads when crawled.Read 15 Oct 2026 · npmjs.com

Confidence and trace

Each classification includes a composite confidence score and an auditable decision trace.Read 15 Oct 2026 · gitwand.app

Configuration

Repository policies and per-file pattern overrides are configured with .gitwandrc or a gitwand key in package.json.Read 15 Oct 2026 · gitwand.app

Conflict engine

Its classifier uses a prioritised registry and automatically applies eight deterministic resolution patterns while leaving complex cases for review.Read 15 Oct 2026 · gitwand.app

Conflict resolution

Its engine uses deterministic patterns with per-hunk confidence scoring and decision traces to resolve conflicts it classifies as safe.Read 7 Oct 2026 · gitwand.app

Git workflow

Features include visual diffs, hunk-level staging, commit splitting, worktrees, submodule management, and an interactive history graph.Read 7 Oct 2026 · gitwand.app

History and branches

The desktop client provides a graphical Git history, branch operations, stash and tag management, cherry-pick and interactive rebase.Read 15 Oct 2026 · github.com

Independent adoption signal

A GitHub discussion participant said the project’s design and UI looked polished after installing it alongside TortoiseGit and SourceGit.Read 15 Oct 2026 · github.com

Independent praise: lightweight operation

The same reviewer described the tool as light and fast, with signed builds, no telemetry and MIT licensing.Read 15 Oct 2026 · zenn.dev

Independent praise: multi-forge workflow

Coder Legion documented expansion from GitHub-only assumptions to pull requests across GitHub, GitLab, Bitbucket and Azure DevOps.Read 15 Oct 2026 · coderlegion.com

Independent praise: structural engine

Coder Legion reported that the engine evolved from text patterns to syntax-tree parsing and added format profiles for JSON and YAML.Read 15 Oct 2026 · coderlegion.com

Independent praise: traceability

A Zenn hands-on review praised the readable decision trace and the ability to inspect proposed output before accepting it.Read 15 Oct 2026 · zenn.dev

Licence

GitWand and its published packages are released under the MIT licence.Read 15 Oct 2026 · github.com

Limit: conflict-style dependency

A Zenn test found that default Git conflict markers leave four of ten tested patterns unavailable because no common-ancestor base is supplied.Read 15 Oct 2026 · zenn.dev

Limit: inconsistent reporting

The reviewer found different conflict counts between preview, CLI status and MCP status, and observed trace text that sometimes described the opposite side from the applied result.Read 15 Oct 2026 · zenn.dev

Limit: localization

The same hands-on review reported French messages mixed into the interface and no environment-variable switch to English for those explanations.Read 15 Oct 2026 · zenn.dev

Limit: secrets detection

The Zenn test said the secrets scanner missed a password embedded in a connection string.Read 15 Oct 2026 · zenn.dev

Limit: unsafe union result

That test reported that diff3 or zdiff3 settings could cause a complex GitHub Actions conflict to be unioned and marked resolved, producing duplicate checkout steps.Read 15 Oct 2026 · zenn.dev

Local processing

The site says GitWand runs locally with no account or telemetry, and its MCP server needs no API key or network access.Read 7 Oct 2026 · gitwand.app

Maker identity

The project identifies its maker and maintainer as Devlint, with GitHub contributor attribution to the devlint account.Read 15 Oct 2026 · gitwand.app

Maker origin

A LinkedIn post by Laurent Guitton says he built GitWand after years of manually resolving merge conflicts and released it under MIT.Read 15 Oct 2026 · fr.linkedin.com

MCP server

The MCP server runs over local stdio, needs no API key or network access, and exposes status, conflict resolution and merge-preview tools to compatible agents.Read 15 Oct 2026 · gitwand.app

Merge preview

The application can simulate a merge before changing the working tree and reports clean, auto-resolvable, partial or manual outcomes.Read 15 Oct 2026 · gitwand.app

Native architecture

The desktop application is built with Tauri 2, Rust and Vue 3 rather than Electron.Read 15 Oct 2026 · gitwand.app

Package activity

The npm core package page showed version 3.11.0, 56 published versions and 146 weekly downloads when crawled.Read 15 Oct 2026 · npmjs.com

Privacy limit

If a hosted LLM provider is selected, GitWand sends the unresolved hunk and surrounding context to that provider.Read 7 Oct 2026 · gitwand.app

Privacy model

The product states that code remains on the user’s machine by default and that AI calls occur only when a user-selected provider is enabled.Read 15 Oct 2026 · gitwand.app

Project age and release pace

A Zenn review recorded the repository’s creation on 2026-04-03, first npm publication on 2026-04-20 and 39 releases by 2026-08-02.Read 15 Oct 2026 · zenn.dev

Public core API

The @gitwand/core package exports resolve, conflict parsing and classification, diff helpers, and format-aware resolvers for JSON, Markdown, YAML, Vue SFC and CSS.Read 15 Oct 2026 · gitwand.app

Pull requests

The app supports pull request review for GitHub, GitLab, Bitbucket, and Azure DevOps, including comments, reviews, CI status, and conflict preview.Read 7 Oct 2026 · gitwand.app

Pull-request integrations

Its in-app pull-request workflow supports GitHub, GitLab, Bitbucket and Azure DevOps, including review comments and CI status.Read 15 Oct 2026 · gitwand.app

Recent release

GitHub lists GitWand v3.12.2 as released on 2026-10-12, with macOS, Linux and Windows installer assets.Read 15 Oct 2026 · github.com

Repositories

GitWand says it works with any local Git repository regardless of hosting service.Read 7 Oct 2026 · gitwand.app

Review control

Token-level merges are proposed for confirmation, and complex conflicts are surfaced for review.Read 7 Oct 2026 · gitwand.app

Secrets scanner

Version 3.5 added a local pre-commit secrets scanner covering common cloud, source-control, messaging, payment, private-key and JWT patterns.Read 15 Oct 2026 · gitwand.app

Self-hosting

The software is designed to operate on local repositories, and the MCP server can be run locally through npx or a global npm install.Read 15 Oct 2026 · gitwand.app

Supported installers

Official downloads include a universal macOS DMG, Linux AppImage or DEB, and Windows MSI or EXE; Windows also supports winget.Read 15 Oct 2026 · gitwand.app

Visual diff and staging

Desktop users get syntax-highlighted diffs with line- and hunk-level partial staging.Read 15 Oct 2026 · gitwand.app

VS Code extension

The VS Code extension adds CodeLens annotations, diagnostics and one-click conflict resolution, and can be installed from the Visual Studio Marketplace.Read 15 Oct 2026 · gitwand.app

Worktrees and submodules

GitWand supports tabbed Git worktrees plus listing, initialization and updating of submodules.Read 15 Oct 2026 · gitwand.app

Plans and prices

Every GitWand plan and price →

Where Specifiction places it

• Git GUI Clients#3 of 328.6