7 ms·Conflict resolution in a GUI with 3 way merge really beats out a command line.by neves 9y agoConflict resolution in a GUI with 3 way merge really beats out a command line.