JuxtaCode

JuxtaCode is a native Git diff and merge tool for macOS developers.

That allows you to browse commit timelines, compare any branch or commit, and see code changes between versions in a side-by-side view. The software can track the complete history of a file, continuously displaying relevant records even if the file has been renamed or moved; commits can be searched by message, hash, branch or tag, and files can be filtered by name, type and change type. JuxtaCode When encountering a merge conflict, it will mark the corresponding commits on both sides of the conflict, helping users trace the source of changes and combine the content of both parties through an accurate three-party editor. Row-level modifications will be retained as the results are edited, and word differences will be updated in real time during the input process, making it easy to check every choice. In addition to Git repositories, JuxtaCode also supports comparing and merging arbitrary plain text. You can start quickly by opening a file, dragging into a file group, or pasting clipboard content. Non-Git comparisons can be edited and saved as a .juxta document, or the results can be written back to the original file. The software provides the juxta command line tool, which can start difference and file merge sessions from the terminal. It can also collaborate with Git clients such as Tower, Gitfox, and Fork, and is suitable for code review, version tracking, conflict resolution, and daily text comparison.