3 ms·
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 <<<<.
by cwojno 7y 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 <<<<.
- philwelch 7y agoCommand-line git allows you to specify a mergetool, many of which are capable of three way merges.
- cwojno 7y agoThe point was convenience. I don't have to leave the IDE.
- chiefsucker 7y agoFor some people Unix is the IDE.