On Fri, Nov 10, 2017 at 2:21 PM, Elijah Newren <newren@xxxxxxxxx> wrote: > There are three conflict types that represent two (possibly entirely > unrelated) files colliding at the same location: <snip> > If the files are similar enough, the two-way merge is probably > preferable, but if they're not similar, recording as separate files is > probably similar. (The same logic that applies for the working That should read, "...recording as separate files is probably preferable".
