Magit vs AraxisMerge
When comparing Magit vs AraxisMerge, the Slant community recommends Magit for most people. In the question“What are the best merge applications for Git?” Magit is ranked 11th while AraxisMerge is ranked 16th. The most important reason people chose Magit is:
Simple tasks, such as commits, can quickly be made without leaving the editor.
Specs
Ranked in these QuestionsQuestion Ranking
Pros
Pro Uninterrupted workflow for common tasks
Simple tasks, such as commits, can quickly be made without leaving the editor.
Pro Diffs are easy
Since it's integrated with Emacs, diffs are very easy to fix. You can jump right to any file you want to fix as soon as it comes up in the logs or in the status view.
Pro Easy to remember mnemonics
You can easily learn the mnemonics for the most common tasks and use them to your advantage to speed up your workflow.
Pro Better visualization and interactive workflow
Pro Stage hunks or even just parts of a hunk using a single key press
In Magit staging a hunk or even just part of a hunk is very easy.
Magit also implements several other "apply variants" in addition to staging and unstaging. For example: you can also discard or reverse a change, or apply it to the working tree.
Pro Blame information can be viewed inline with the file
Pro Multiple buffers are used to show contextual information
Pro Powerful rebasing
Pro Available in Homebrew
brew install magit
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
Cons
Con Useful only for people who use Emacs
Magit is only useful if your text editor of choice is Emacs. It wouldn't really make any sense to open up emacs just to run Magit if you use another editor.
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.