Branchlight
Resolve conflicts in place
Local, editable result and incoming side by side with full-file context. Arrows accept a change, × dismisses it, and you can still type in the result. Undo covers both text and decisions.
0.6 early access · macOS
A quieter place to work with Git.
A focused desktop client with a clear commit graph, useful diffs and careful three-way conflict resolution. It runs the official Git you already have, so what you see is what Git does.
Free for 14 days · macOS 12+ on Apple Silicon · Windows coming later
Stage exactly what you mean
Stage, unstage or discard per hunk or per line, built on Git's own diff and
git apply. Discards are backed up first and can be restored.
A log that keeps up
A compact lane graph with virtual scrolling, filters by message, branch, author, path and date across the whole repository, and the everyday commit actions one right-click away.
Careful with your files
Saving a merge result and marking it resolved are separate steps. External edits are detected before anything is written, and force-push is always lease-protected.
The rest of the loop
Fetch, pull, push with progress and cancel; branches, stashes, worktrees, rebase, cherry-pick, file history and annotate.
Native and quiet
A restrained dark workspace that leaves room for code. Signed and notarized by Apple, and it updates itself from inside the app.
Early access
US$29.99 one-time
- Every 0.x and 1.x release included
- One activation code per computer, movable by deactivating
- Works offline once activated
- Price rises to US$49.99 at 1.0
Tax included. Your activation code arrives by email right after payment.
Questions
Does the trial have limits?
No. Everything works for 14 days. Afterwards opening repositories needs an activation code; your files and repositories are never touched.
Do I need Git installed?
Yes. Branchlight runs the official Git on your Mac, for example the one from the Xcode Command Line Tools or Homebrew.
I got a new Mac. What happens to my license?
Choose “Deactivate this computer” in the old one, then activate the new one with the same code. If the old Mac is gone, reply to your purchase email.
Is there a Windows version?
It is in progress. A code you buy now will work on Windows too, one computer at a time.