• Nothing saved
Done!
Developer: Yori Mihalakopoulos (2)
Price: * Free
Score: 1,810 Gold
Rankings: 0 
Comments: 0 Add a comment
Lists: 0 + 2
Points: 1 + 0 ¡
+1 Points

Description

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.
more ↓

Screenshots

#1. JuxtaCode (macOS) By: Yori Mihalakopoulos
#2. JuxtaCode (macOS) By: Yori Mihalakopoulos
#3. JuxtaCode (macOS) By: Yori Mihalakopoulos
#4. JuxtaCode (macOS) By: Yori Mihalakopoulos
#5. JuxtaCode (macOS) By: Yori Mihalakopoulos
Ad

Price History

Track prices

AppAgg Score

1,810
BronzeSilverGoldPlatinumLegend

Estimated AppAgg Score for  
JuxtaCode

1,810 Gold

Higher scores usually mean stronger signals on AppAgg.

Based on:  popularity ·  ratings ·  freshness ·  deals ·  store data ·  community signals

Recalculated daily using fresh AppAgg data.

Short URL: Copied!

What's new

  • Version: 1.3
  • Last Updated:
  • - Twin Focus: when enabled, hover over a word in a side-by-side diff to highlight the corresponding word on the other side(s) of the diff.
    - Improved diffing algorithm: better recognition when two bodies of text mainly differ by their line breaks. For example, if [A] has a long paragraph all on one line and [B] has the same content split over multiple lines to maintain a maximum column width, then both passages will be grouped as "modified ≠" and their newline differences highlighted.
    - Improved diff UI: extra connecting lines now appear in diff dividers when there are a few scattered word differences that might be hard to spot within a large modified segment. In these cases, they'll help to point out where they are and which lines they match up on.
    - Added the ability for JuxtaCode to serve as a merge tool for Jujutsu.
    - Performance improvements when generating large diffs.
    - Fixes an occasional stack overflow crash when generating diffs.
    - You can edit a text clipping's title by selecting it in the sidebar and pressing enter.
    - Fixed a bug that caused scrolling to break when both sides of a diff were identical.
    - Fixed a bug that caused the file drop-down menu to not fully populate at first when using 'git difftool'.
    - Navigation toolbar buttons (up and down arrows) now become disabled when there are no segments to navigate in a diff.

Additional Information

Developer

Lists (0)

0
  • JuxtaCode

Points (1)

  • Carlos V
    • 216 Carlos V
    • +1

Rankings (0)

0

Comments (0)

Be the first to comment 

Summary

JuxtaCodeJuxtaCode Short URL: Copied!
  •  Share
  • Mac App Store
«JuxtaCode» is a Developer Tools app for macOS, developed by «Yori Mihalakopoulos». It was first released on and last updated on . This app is currently free. This app has not yet received any ratings on AppAgg. AppAgg has tracked 1 confirmed points plus 0 indirect points for this app. Available languages: English. AppAgg continuously tracks the price history, ratings, and user feedback for «JuxtaCode». AppAgg does not host applications or distribute software. All trademarks, logos and screenshots belong to their respective owners. Subscribe to this app or follow its RSS feed to get notified about future deals or updates.

Similar

 more →

You may also like

Recently viewed

Search operators you can use with AppAgg
Add to AppAgg
AppAgg
Start using AppAgg. It’s Free!
Sign Up
Sign In