JuxtaCode

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.