Comment by cwojno
6 years ago
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 <<<<.
6 years ago
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 <<<<.
Command-line git allows you to specify a mergetool, many of which are capable of three way merges.
The point was convenience. I don't have to leave the IDE.
For some people Unix is the IDE.