Re: [PATCH v7 21/31] merge-recursive: add a new hashmap for storing file collisions

2018-02-05 Thread Stefan Beller
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > Directory renames with the ability to merge directories opens up the > possibility of add/add/add/.../add conflicts, if each of the N > directories being merged into one target directory all had a file with > the same name.

[PATCH v7 21/31] merge-recursive: add a new hashmap for storing file collisions

2018-01-30 Thread Elijah Newren
Directory renames with the ability to merge directories opens up the possibility of add/add/add/.../add conflicts, if each of the N directories being merged into one target directory all had a file with the same name. We need a way to check for and report on such collisions; this hashmap will be