AraxisMerge vs Fork
When comparing AraxisMerge vs Fork, the Slant community recommends AraxisMerge for most people. In the question“What are the best visual merge tools for Git?” AraxisMerge is ranked 7th while Fork is ranked 11th. The most important reason people chose AraxisMerge is:
AraxisMerge has a feature which is very helpful especially for beginners. By clicking on different parts of a text file you can select all the parts to added in a final merged file. The comparison display also updates real-time as the merge happens.
Specs
Ranked in these QuestionsQuestion Ranking
Pros
Pro Point and click merging
AraxisMerge has a feature which is very helpful especially for beginners. By clicking on different parts of a text file you can select all the parts to added in a final merged file. The comparison display also updates real-time as the merge happens.
Pro Directory comparisons
AraxisMerge supports comparing different directories with each other.
Pro Beautiful interface
Pro Three way merges
AraxisMerge supports three way merges.
Pro Update alternative files Word, PDF and even images
Pro Works great on large files
Pro Fast and easy to use
Pro Comfortable when staging line-by-line changes
This feature is superior to the one that is implemented by SourceTree as it does not reset the file scroll view to the top of the file after each stage.
If you do feature-specific commits after some time of development - it's very important to be able to easily compose the commit from different line-based changes.
Pro Smart Diff is very handy
Pro Tabbed interface
Several repos can be open at once in individual tabs, so it's trivial to switch back and forth between them.
Pro Overall aesthetic
The GUI components are flawless on the Mac. It is expected to be a similar experience on Windows. Once you realize that you can filter by branch, your appreciation for the product will go up dramatically.
Pro Dark theme support
Pro Highlights the difference within a line
Pro Merge Conflict Resolution is great
Pro Comfortable keyboard shortcuts
Pro Repositories with uncommitted changes have a * next to their name
This is an update from previous versions.
Cons
Con Commercial
AraxisMerge is not free:
$129 Standard and $269 Professional
But this is peanuts for a tool that you can use all day for the rest of your developer life.
Con Still a young client, thus not as feature rich
This git GUI client is quite young compared to industry old-timers like git-tower 2 or SourceTree. So it's not as feature rich as you'd like. Still a very capable client for a simple day-to-day work.
Con No Linux version
This git client is not compatible with Linux making the life harder for the developers that work on both, MacOS and some Linux distro.
Con Requires granting access to your git projects for the developer of the app
