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.
This app hasn’t received enough ratings or reviews to display an overview.
Best Merge Tool I've Ever Used
jwgoodrick
This app absolutely nails the git merge conflict flow. I have tried several different clients out there, and though I usually just operate from Terminal for most things, when I hit a merge conflict, I immediately turn to this app. It lays everything out so well visually and surfaces exactly the information I am interested in when trying to resolve conflicts.Best $40 I've spent in a long time, as it significantly improves my workflow. I love that I could purchase this without yet another subscription!The one and only thing I hope to one day see in the app is image diffs during conflict resolution (for comparing snapshot tests). I would absolutely pay for another in-app purchase just to unlock a feature like that.
Really fantastic UX
jack135797531
I like the simplicity of JuxtaCode — I find myself using the paste function most often, quickly opening the app to compare two snippets that I copy to my clipboard in sequence. A teensy improvement could be making it so that it automatically places the pasted content into A and B when you click each respective clipboard. But honestly the core comparison and merge views are so great that it’s hard to complain. The native UX/UI components are particularly strong. Highly recommended overall, well done!
- Fixes appearance of window titlebars in macOS 26.2.
- Fixes appearance of floating header views in commit diffs in macOS Sonoma & Sequoia.
Version 1.2.5
The developer, Yori Mihalakopoulos, indicated that the app’s privacy practices may include handling of data as described below. For more information, see the developer’s privacy policy .
Data Not Linked to You
The following data may be collected but it is not linked to your identity:
Diagnostics
Privacy practices may vary, for example, based on the features you use or your age. Learn More
The developer indicated that this app supports the following accessibility features. Learn More