GitDifferent
A conflict opens your editor. A review opens a browser. A stack means the CLI. GitDifferent does all three itself.
Free for 3 repositories. One-time purchase. No subscription.
Or with Homebrew:
brew install --cask vheissulabs/tap/gitdifferent
A conflict is usually where a git client hands you off. GitDifferent is the merge tool, inside a full git client — three panes, aligned row for row, already open the moment a merge goes wrong.
Real three-pane conflict resolution
Stop resolving merges inside conflict markers.
Aligns Ours, Result and Theirs row for row, with word-level highlights. Take chunks with a click, edit the result directly, and move between conflicts without leaving for your editor.
Native stack-aware merging
Stacked PRs treated like chains, not chaos.
Dependent branches drawn in order, each with its check status. Merge unlocks only when every layer underneath is green — and says why when it is not.
PR reviews powered by your CLI
GitHub and GitLab reviews without web tabs or auth tokens.
Inline comments, approvals and resolved threads, inside the client, using the gh and glab credentials you already have.
Everything else you expect
Line-level staging
Stage exact hunks or individual lines, not entire files.
Interactive history
Rebase, squash, cherry-pick and reorder commits from the visual log.
Worktree hooks
A new worktree runs your script — copy the .env, run the install — and is ready to work in.
Unified branching
Local and remote in one view, with ahead/behind counts, checks, and why each branch is still here.
Split & unified diffs
Syntax highlighting for 89 languages, with unchanged code collapsed away.
Safety first
Co-authors on the commit, a quick amend, and an instant undo when a commit goes sideways.
Buy it once. Own it forever.
$49.99 one time
- Free for up to 3 repositories — no card required
- Unlimited repositories with a licence
- Use it on 3 of your computers
- All updates included for the current generation
- No recurring subscription
Or with Homebrew:
brew install --cask vheissulabs/tap/gitdifferent
Three repos are free, with no card. No subscription, nothing expires.
Your licence covers every update to this generation of GitDifferent, for good. If a new generation is ever sold, what you bought keeps working exactly as it does today — and you get a discount on the new one.