Skip to content

Commit a2aa83c

Browse files
author
Laurent Guitton
committed
docs(website): fact-check /compare tables against July 2026 competitor data
- GitHub Desktop 3.6: add worktrees (✅) and Copilot-assisted conflict resolution + commit authoring; drop worktrees as a differentiator - GitKraken: correct price (free Community tier + Pro ~$5/mo annual, was $8/mo); it now runs local coding-agent CLIs in worktrees too, so reframe the split around the deterministic engine + no-account rather than local-vs-cloud AI - Fork: correct price ($59.99, was $50); PR support is create/view + CI status, not full inline review - Verify unchanged: Sublime Merge $99, GitButler free-forever
1 parent 2c7f869 commit a2aa83c

4 files changed

Lines changed: 28 additions & 27 deletions

File tree

website/compare/gitwand-vs-fork.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: GitWand vs Fork (2026) — free alternative with PR review and conflict auto-resolution
3-
description: GitWand vs Fork compared — $0 vs $50, Linux support, in-app PR review, merge conflict auto-resolution and AI integration. An honest verdict, updated July 2026.
3+
description: GitWand vs Fork compared — $0 vs $59.99, Linux support, in-app PR review, merge conflict auto-resolution and AI integration. An honest verdict, updated July 2026.
44
head:
55
- - meta
66
- property: og:title
@@ -12,22 +12,22 @@ head:
1212

1313
# GitWand vs Fork
1414

15-
**The verdict in three sentences.** Fork is one of the best-crafted Git clients ever made — if you're on macOS/Windows, don't need PR reviews in-app, and $50 once is fine, it will not disappoint you. GitWand matches the "fast, clean, native" philosophy but is **free, open source, runs on Linux, reviews PRs from four forges in-app, and auto-resolves the trivial ~95% of merge conflicts** with a deterministic engine. If conflicts and code review are part of your daily Git life, that's the gap that matters.
15+
**The verdict in three sentences.** Fork is one of the best-crafted Git clients ever made — if you're on macOS/Windows, don't need full PR review in-app, and $59.99 once is fine, it will not disappoint you. GitWand matches the "fast, clean, native" philosophy but is **free, open source, runs on Linux, reviews PRs from four forges in-app, and auto-resolves the trivial ~95% of merge conflicts** with a deterministic engine. If conflicts and code review are part of your daily Git life, that's the gap that matters.
1616

1717
*Facts checked July 2026.*
1818

1919
## Side by side
2020

2121
| | GitWand | Fork |
2222
|---|---|---|
23-
| Price | **Free, MIT open source** | $50 one-time (free evaluation) |
23+
| Price | **Free, MIT open source** | $59.99 one-time (free evaluation) |
2424
| Platforms | macOS · **Linux** · Windows | macOS · Windows |
2525
| Stack | Tauri 2 + Rust, ~8 MB | Native (per-platform) |
2626
| Merge conflicts | **Auto-resolves ~95% of trivial hunks**, confidence scores, decision trace | Good 3-way merge editor (manual) |
27-
| PR / MR review | In-app: GitHub, GitLab, Bitbucket, Azure DevOps — inline comments, suggestions, CI annotations | Opens PRs in the browser |
27+
| PR / MR review | In-app: GitHub, GitLab, Bitbucket, Azure DevOps — inline comments, suggestions, CI annotations | Create & view PRs + CI status; no inline review |
2828
| Interactive rebase | ✅ including split-commit-by-hunks | ✅ excellent |
2929
| Worktrees | First-class (tab = worktree, scratch worktrees) | Supported |
30-
| AI | Agent sessions (Claude Code, Codex, opencode…), per-hunk critique, MCP server — all local, all opt-in | None |
30+
| AI | Agent sessions (Claude Code, Codex, opencode…), per-hunk critique, MCP server — all local, all opt-in | AI commit messages |
3131
| History view | Git Tree (multi-branch DAG, filters, `#PR` search) | Commit graph (excellent) |
3232

3333
## Where Fork wins
@@ -42,11 +42,11 @@ This is the category difference. Fork gives you a merge editor; GitWand gives yo
4242

4343
### 2. Code review without leaving the app
4444

45-
Fork sends you to the browser for PRs. GitWand renders the diff, inline discussions, pending-review batches, GitHub-native suggestions and CI check annotations in-app, for GitHub, GitLab, Bitbucket **and** Azure DevOps — plus **Today**, a cross-repo inbox of PRs awaiting you.
45+
Fork can create and view PRs and show CI status, but the actual review — reading the diff, leaving inline comments, batching a review — still happens in the browser. GitWand renders the diff, inline discussions, pending-review batches, GitHub-native suggestions and CI check annotations in-app, for GitHub, GitLab, Bitbucket **and** Azure DevOps — plus **Today**, a cross-repo inbox of PRs awaiting you.
4646

4747
### 3. Free, open, everywhere
4848

49-
MIT license, Linux builds (.deb/.AppImage/.rpm), a [CLI](/guide/cli), a [VS Code extension](/guide/vscode), and an [MCP server](/guide/mcp) so your AI agents use the same engine you do. Fork is $50/seat, two platforms, closed source.
49+
MIT license, Linux builds (.deb/.AppImage/.rpm), a [CLI](/guide/cli), a [VS Code extension](/guide/vscode), and an [MCP server](/guide/mcp) so your AI agents use the same engine you do. Fork is $59.99/seat, two platforms, closed source.
5050

5151
## FAQ
5252

website/compare/gitwand-vs-github-desktop.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: GitWand vs GitHub Desktop (2026) — the free upgrade path
3-
description: GitWand vs GitHub Desktop compared — both free, but multi-forge support, interactive rebase, worktrees and automatic merge conflict resolution set them apart. Updated July 2026.
3+
description: GitWand vs GitHub Desktop compared — both free, but multi-forge support, interactive rebase and deterministic merge conflict resolution set them apart. Updated July 2026.
44
head:
55
- - meta
66
- property: og:title
@@ -12,7 +12,7 @@ head:
1212

1313
# GitWand vs GitHub Desktop
1414

15-
**The verdict in three sentences.** If you're new to Git, live 100% on GitHub, and want the least-intimidating on-ramp ever built, GitHub Desktop is exactly that — genuinely great at being simple, and there's no shame in staying. GitWand is the tool you graduate to **without paying**: also free, but multi-forge (GitLab, Bitbucket, Azure DevOps too), Linux-supported, with interactive rebase, worktrees, in-app PR review — and an engine that **auto-resolves the trivial ~95% of merge conflicts**. The day a merge conflict first scares you is the day the difference matters.
15+
**The verdict in three sentences.** If you're new to Git, live 100% on GitHub, and want the least-intimidating on-ramp ever built, GitHub Desktop is exactly that — genuinely great at being simple, and there's no shame in staying. GitWand is the tool you graduate to **without paying**: also free, but multi-forge (GitLab, Bitbucket, Azure DevOps too), Linux-supported, with interactive rebase and full in-app PR review — and an engine that **auto-resolves the trivial ~95% of merge conflicts deterministically**. The day a merge conflict first scares you is the day the difference matters.
1616

1717
*Facts checked July 2026.*
1818

@@ -24,12 +24,12 @@ head:
2424
| Platforms | macOS · **Linux** · Windows | macOS · Windows |
2525
| Stack | Tauri 2 + Rust, ~8 MB | Electron |
2626
| Forges | GitHub, GitLab, Bitbucket, Azure DevOps | GitHub (others: basic push/pull only) |
27-
| Merge conflicts | **Auto-resolves ~95% of trivial hunks** + guided editor | Opens your editor at the markers |
27+
| Merge conflicts | **Auto-resolves ~95% of trivial hunks** (deterministic) + guided editor | Copilot AI assist (opt-in, 3.6) or your editor |
2828
| PR review | Full in-app: diff, inline comments, suggestions, CI annotations | Link to github.com |
2929
| Interactive rebase | ✅ (+ split commit by hunks) ||
30-
| Worktrees / submodules | First-class |/ minimal |
30+
| Worktrees / submodules | First-class (tab = worktree, scratch worktrees) | ✅ worktrees (3.6) / minimal submodules |
3131
| History | Git Tree DAG, filters, file history with pickaxe | Linear list, basic diff |
32-
| AI | Optional agent sessions, per-hunk critique, MCP server | Copilot commit messages |
32+
| AI | Optional agent sessions, per-hunk critique, MCP server | Copilot commit authoring + conflict resolution |
3333
| Sign-in | Optional (for PR features, OAuth device flow) | GitHub account expected |
3434

3535
## Where GitHub Desktop wins
@@ -40,15 +40,15 @@ head:
4040

4141
### 1. The first merge conflict
4242

43-
GitHub Desktop's conflict story is "open in your editor" — you're on your own with the markers. GitWand [classifies every hunk](/conflict-engine) against 10 deterministic patterns and resolves the trivial ones itself, with a confidence badge and a plain-English explanation per hunk. Beginners keep a guided 3-way editor for the rest; seniors get their afternoon back.
43+
GitHub Desktop 3.6 added Copilot-assisted conflict resolution — but that means either opening your editor at the markers or trusting an LLM's guess (and it needs Copilot). GitWand [classifies every hunk](/conflict-engine) against 10 **deterministic** patterns and resolves the trivial ones itself, with a confidence badge and a plain-English explanation per hunk — no model, no guess, a replayable trace. Beginners keep a guided 3-way editor for the rest; seniors get their afternoon back.
4444

4545
### 2. Not married to GitHub
4646

4747
Same client for GitHub, GitLab, Bitbucket and Azure DevOps: PR/MR review with inline comments and CI annotations in-app, multiple accounts, cross-fork PRs. Your client shouldn't change when your employer does.
4848

4949
### 3. Room to grow
5050

51-
Interactive rebase (with commit splitting), first-class worktrees, submodules, stash management, a real DAG history with search the features you eventually need are already there, discoverable progressively rather than bolted on.
51+
Interactive rebase (with commit splitting) — which GitHub Desktop still lacks — submodules, stash management, a real DAG history with search, and worktrees wired into the tab model: the features you eventually need are already there, discoverable progressively rather than bolted on.
5252

5353
## FAQ
5454

website/compare/gitwand-vs-gitkraken.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: GitWand vs GitKraken (2026) — free alternative with conflict auto-resolution
3-
description: GitWand vs GitKraken compared — price ($0 vs $8/mo), Electron vs native Rust, AI approaches, PR workflow, and merge conflict resolution. An honest verdict, updated July 2026.
3+
description: GitWand vs GitKraken compared — price ($0 vs ~$5/mo Pro), Electron vs native Rust, AI approaches, PR workflow, and merge conflict resolution. An honest verdict, updated July 2026.
44
head:
55
- - meta
66
- property: og:title
@@ -12,21 +12,22 @@ head:
1212

1313
# GitWand vs GitKraken
1414

15-
**The verdict in three sentences.** If your team lives in GitKraken's cloud Workspaces, needs its team-management features, or you simply want the most polished commercial ecosystem, GitKraken remains an excellent product — keep it. If you want a **free, open-source, native client that never phones home and actually resolves your merge conflicts**, GitWand does that, in an ~8 MB binary. The philosophical split is real: GitKraken is a subscription suite with cloud AI; GitWand is a local-first tool with a deterministic engine.
15+
**The verdict in three sentences.** If your team lives in GitKraken's cloud Workspaces, needs its team-management features, or you simply want the most polished commercial ecosystem, GitKraken remains an excellent product — keep it. If you want a **free, open-source, native client that never requires an account and actually resolves your merge conflicts deterministically**, GitWand does that, in an ~8 MB binary. Both now launch local coding-agent CLIs, so the real split is narrower than it looks: GitKraken is a funded subscription suite (Electron, cloud AI, optional account); GitWand is a free MIT tool built around a deterministic conflict engine.
1616

1717
*Facts checked July 2026.*
1818

1919
## Side by side
2020

2121
| | GitWand | GitKraken |
2222
|---|---|---|
23-
| Price | **Free, MIT open source** | Free tier (non-commercial); Pro from ~$8/mo |
24-
| Stack | Tauri 2 + Rust, ~8 MB | Electron, ~150 MB class |
25-
| Merge conflicts | **Auto-resolves ~95% of trivial hunks** — 10 deterministic patterns, confidence score, decision trace | 3-way merge editor; AI suggestions (cloud) |
23+
| Price | **Free, MIT open source** | Free Community tier; Pro ~$5/mo (billed annually) |
24+
| Stack | Tauri 2 + Rust, ~8 MB | Electron (v41), ~150 MB class |
25+
| Merge conflicts | **Auto-resolves ~95% of trivial hunks** — 10 deterministic patterns, confidence score, decision trace | 3-way merge editor; AI suggestions |
2626
| PR / MR review | In-app, 4 forges: GitHub, GitLab, Bitbucket, Azure DevOps — inline comments, suggestions, CI annotations | In-app, multi-forge (Launchpad) |
27-
| AI | Local-first: launch Claude Code / Codex / opencode in-app, per-hunk critique, MCP server — all opt-in | Agent Mode (v12), AI commit/PR/merge — cloud account |
27+
| AI | Agent sessions (Claude Code, Codex, opencode…) in-app, per-hunk critique, MCP server exposing the engine — all local, opt-in | Agent sessions in worktrees (Claude Code, Codex, Copilot, Gemini, opencode) + cloud GitKraken AI (commit/PR/merge) |
28+
| Worktrees | First-class (tab = worktree, scratch worktrees) | First-class (agent session per worktree) |
2829
| Cross-repo dashboard | Today inbox + Dashboard | Launchpad + cloud Workspaces |
29-
| Account required | **Never** | For AI and advanced features |
30+
| Account required | **Never** | For cloud AI and advanced features |
3031
| Offline | Fully functional | Core works; cloud features don't |
3132

3233
## Where GitKraken wins
@@ -39,9 +40,9 @@ Being honest: **team features**. Cloud Workspaces shared across an organization,
3940

4041
GitKraken gives you a good 3-way editor and, lately, AI suggestions — which means either manual work or trusting a model's guess. GitWand's [engine](/conflict-engine) classifies every hunk against 10 deterministic patterns (reorder-only, boundary insertions, structural entity merges via tree-sitter, lockfile-aware resolvers…) and auto-resolves the trivial ~95% with a per-hunk confidence score and a replayable decision trace. No guess enters your history. The [LLM fallback](/guide/llm-fallback) is opt-in, labeled, and audited.
4142

42-
### 2. Native performance, zero cloud
43+
### 2. Native performance, no account
4344

44-
Tauri 2 + Rust: sub-second startup, smooth on 100k+ commit repos, ~8 MB installed. Everything — including all AI features — runs locally; the AI providers are the CLI agents *you* already have (Claude Code, Codex, opencode), launched in-app, never a GitWand cloud.
45+
Tauri 2 + Rust: sub-second startup, smooth on 100k+ commit repos, ~8 MB installed versus Electron's ~150 MB class. Both clients can now launch local coding-agent CLIs, but GitWand needs **no account at all** — every feature, including the AI ones, runs against the CLI agents you already have; there is no GitWand cloud and nothing to sign into. GitKraken's advanced and AI features gate behind an account.
4546

4647
### 3. Price and freedom
4748

website/compare/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ These comparisons are written by the GitWand team, so read them with that in min
2020

2121
| | GitWand | [GitKraken](/compare/gitwand-vs-gitkraken) | [Fork](/compare/gitwand-vs-fork) | [Sublime Merge](/compare/gitwand-vs-sublime-merge) | [GitHub Desktop](/compare/gitwand-vs-github-desktop) | [GitButler](/compare/gitwand-vs-gitbutler) |
2222
|---|---|---|---|---|---|---|
23-
| Price | **Free (MIT)** | $8/mo (Pro) | $50 | $99 | Free | Free |
23+
| Price | **Free (MIT)** | Free tier; Pro ~$5/mo | $59.99 | $99 | Free | Free |
2424
| Open source |||||||
2525
| Stack | Tauri 2 + Rust (~8 MB) | Electron | Native | Native | Electron | Tauri + Rust |
2626
| Platforms | macOS · Linux · Windows | macOS · Linux · Windows | macOS · Windows | macOS · Linux · Windows | macOS · Windows | macOS · Linux · Windows |
27-
| Auto-resolves conflicts | ✅ deterministic engine | ❌ (AI suggestions) |||||
28-
| In-app PR review | ✅ 4 forges || || GitHub only | Stacked PRs |
29-
| AI / agent integration | Agent sessions + MCP server | Agent Mode (cloud) ||| Copilot commits | Agents Tab + MCP |
27+
| Auto-resolves conflicts | ✅ deterministic engine | ❌ (AI assist) ||| (Copilot assist) ||
28+
| In-app PR review | ✅ 4 forges || Create & view only || GitHub only | Stacked PRs |
29+
| AI / agent integration | Agent sessions + MCP server | Agent sessions + cloud AI ||| Copilot commits + conflicts | Agents Tab + MCP |
3030
| Account required | Never | For advanced features | No | No | GitHub | No |
3131

3232
## The deep dives

0 commit comments

Comments
 (0)