2 ms·
If you think "mine" and "theirs" doesn't make sense, just wait until you start reading the _other_ merge strategies ("ort", "octopus", etc.)
by nunez 4y ago
If you think "mine" and "theirs" doesn't make sense, just wait until you start reading the _other_ merge strategies ("ort", "octopus", etc.)