I've always been puzzled by 4-way merge not being more common. Support is quite rare.
KDiff3 is another tool that supports it.
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.
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.
Sadomasochism runs deep.
If you’re not suffering for your craft, you’re not a Real Programmer.
OTOH, IntelliJ’s "Magic wand" is totally worth the hassle.