JuxtaCode

JuxtaCode provides a graphical interface for browsing Git repositories on macOS, allowing users to view commit histories, inspect individual file changes, and track a file’s evolution across renames and moves. The side‑by‑side diff view lets developers compare any two changesets, with syntax highlighting and filters for commit messages, hashes, branches, tags, file names, types, or change categories.

The tool includes a three‑way merge editor that detects conflicts, labels them as OURS and THEIRS, and offers fine‑grained resolution controls, including the ability to unresolve files and retry merges. It also supplies a commit inspector for searching and filtering the project timeline, helping users understand the provenance of conflicts and code modifications.

Designed for macOS, JuxtaCode integrates with command‑line workflows, can be launched from Git clients, and offers optional Visual Studio Code integration, making it a convenient addition for developers who need visual diff, merge, and history navigation capabilities.