You can use the
juxta command line tool to compare changesets and resolve conflicts from the Terminal. It can also be used to integrate JuxtaCode with Git and other tools.
If you have the direct version of JuxtaCode (not from the App Store), you can install the command line tool from the app’s menu by selecting:
JuxtaCode → Command Line Tool… and click
App Store Version
If you have the App Store version of JuxtaCode, you’ll need to download the tool separately:
To open the current repository:
To resolve a conflicted file:
> juxta merge conflicted-file.txt
To compare 2 branches:
> juxta diff main dev
juxta help for more information.