I hate how the UI looks like a half-assed rip-off of Windows 95, but it's the only tool I know that shows me everything I want to see when merging / rebasing git branches.
I think it also allows comparing 3 or more arbitrary files, which seems like a pretty basic task that most diff tools just can't do at all.
KDiff3 is another tool that supports it.
A fortnight later, they wreck a merge and they spend their afternoon re-merging conflicts they’ve already had.
Such people almost always use the git tools provided in IntelliJ.
OTOH, IntelliJ’s "Magic wand" is totally worth the hassle.
Sadomasochism runs deep.
If you’re not suffering for your craft, you’re not a Real Programmer.
I wouldn't know how to explain what does the magic wand do, but it seems a huge waste of time NOT having it in other merge solutions. I can't remember a case where it the magic wand was causing a semantic error and I'm using it for 7-8 years by now. Mostly in Clojure code though.
I became familiar with it at a previous job that used perforce, and I have just kept using it with git. It's free to download, although you have to fill out an annoying form.
But Meld is great at 2 way merges, and allowing you to selectively apply changes.