Re: [RFC PATCH 3/9] merge-recursive: New function for better colliding conflict resolutions

On Fri, Nov 10, 2017 at 2:21 PM, Elijah Newren wrote: > There are three conflict types that represent two (possibly entirely > unrelated) files colliding at the same location: > If the files are similar enough, the two-way merge is probably > preferable, but if they're not

[RFC PATCH 3/9] merge-recursive: New function for better colliding conflict resolutions

There are three conflict types that represent two (possibly entirely unrelated) files colliding at the same location: * add/add * rename/add * rename/rename(2to1) These three conflict types already share more similarity than might be immediately apparent from their description: (1) the