[cwojno]

Try doing a merge with IntelliJ's 3-way merge UI. It's flippin' fantastic compared to roaming through the files and removing sections between >>>> and <<<<.

[philwelch]

Command-line git allows you to specify a mergetool, many of which are capable of three way merges.

[cwojno]

The point was convenience. I don't have to leave the IDE.

[chiefsucker]

For some people Unix is the IDE.