Here are the things every git client should have before opening up: 1) side by side comparison—seems like it only has vertical, which means for heavy changes it's basically useless. 2) conflict resolution. 3) search (it seems like gitkraken does this well from the screenshots) 4) Interactive rebasing, the bread and butter of clean git usage. Without the above as a minimum , I might as well just use the git cli all th…
1 and 2 can be handled by meld[1], available both on Linux and on OSX (via brew). It integrates with git with just `git mergetool -t meld`. 1: http://meldmerge.org/
Source: my day job used to involve daily merging of Chromium with Rockmelt and I probably evaluated every merge tool that existed at the time.
Tip: git config --global merge.conflictstyle=diff3