The ultimate Git merge tool for the Mac is here!
Compare code with ease. Take the pain out of nasty merge conflicts.
Try free for 14 days. Unlock with a single purchase.
---
With JuxtaCode's intuitive interface, you can effortlessly compare branches, track a file's history, and resolve merge conflicts without leaving the app. Just open your repository, and get to work:
• Browse Commits
Open your repository to browse its history as well as your current changes.
• Compare Code Changes
Select 2 commits or branches to compare them side-by-side.
• File History
Open a source file in JuxtaCode to see a complete list of all the changes it has gone through, including current edits, even across renames.
• Resolve Merge Conflicts
When you have a conflict, JuxtaCode shows you which 2 branches caused it and the files that need to be resolved. You can resolve each file by selecting from the 2 conflicting versions, or you can open the file in the powerful built-in merge tool.
• 3-Way Merge Tool
Weave together code from both sides of the conflict with the intuitive merge tool. Major differences are highlighted in color-coded bands that grow and shrink as you make changes. Word differences are also dynamically highlighted.
• Powerful Filtering
To help drill down to specific code changes, you can filter your repository's timeline by branch or tag. You can also filter commit diffs to only show the specific files that you're interested in.
• Compare & Merge Any Plain Text
It's not just about Git. Drag or paste whatever plain text you'd like into JuxtaCode to take advantage of its powerful diff and merge tools.
All this and other nice things like:
• Snappy native performance, and
• Syntax highlighting
Try it free for 14 days and unlock the full app with a single purchase.
Say goodbye to merge headaches with JuxtaCode, your new go-to Git merge tool for the Mac.
评分及评论
此 App 尚未收到足够的评分或评论，无法显示整体评分。
- Export to PDF or images: Choose File ▸ Export PDF or Image… to save a side-by-side comparison as a paginated or continuous PDF, or as a set of PNG images. Export the whole comparison or just a range of lines, choose light or dark appearance, the highlighting theme, font and paper size, and decide whether to include line numbers and column headers.
- Windows reopen where you left them: When you relaunch JuxtaCode, your commit, file history, comparison and merge windows now reopen along with your repositories. Window sizes and divider positions are remembered for each document, and the Commit Inspector remembers which commit messages you expanded. Sessions started from git difftool or git mergetool aren't restored.
- The coloured bar beside the active section of an editable comparison is now subtler, especially in Light appearance, so it no longer flashes distractingly as you scroll.
- More buttons and menu items now show a help tag when you hover over them.
- Fixed: On macOS 27, opening several files at once from Finder or the Dock could open each file on its own, or ask about file history once per file, instead of comparing them together. Folders opened at the same time are no longer ignored.
- Fixed: git difftool could occasionally leave some changed files out of the file list, and comparisons against a merge base (such as git difftool main...feature) could show the wrong base revision for some files.
- Fixed: On macOS 27, the arrow keys didn't move through the commit list after clicking a commit, and selecting a conflicted file could leave its keyboard shortcuts and File menu commands unavailable.
- Fixed: Rows in the commit list cut off their text when a larger system text size was set.
