MeetJuxtaCode.Review Git history, compare branches, and resolve conflicts in a three-way merge editor.

developer-tools
PaidOne-time purchaseVisit site
JuxtaCode comparing two Git commits side by side

About JuxtaCode

JuxtaCode is a Mac interface for inspecting changes in a Git repository. It connects commits, file history, and conflicts so you can see where a change came from before deciding how to merge it.

Features

  • Compare two branches or commits side by side.
  • Trace a file across renames and search the commit timeline.
  • Resolve conflicts in a three-way editor and export comparisons as PDF or PNG.

Privacy and requirements

JuxtaCode opens repositories you select on your Mac. Resolving conflicts can change working files, so review the resulting Git diff before committing.

Pricing

The developer offers a trial and a one-time purchase, with separate direct and Mac App Store purchase options.

Sublime Text application iconSublime TextZed application iconZed