Re: [RFC PATCH 0/5] Improve path collision conflict resolutions

On Mon, Mar 5, 2018 at 9:11 AM, Elijah Newren wrote: > 2) Doing content merges for a rename before looking at the path collision > between a rename and some other file. In particular (in what I most > suspect others might have an objection to from this series),

[RFC PATCH 0/5] Improve path collision conflict resolutions

This series improves conflict resolutions for conflict types that involve two (possibly entirely unrelated) files colliding at the same path. These conflict types are: * add/add * rename/add * rename/rename(2to1) Improving these conflict types has some subtle (though significant)