Re: [PATCH v7 20/31] merge-recursive: check for directory level conflicts

2018-02-05 Thread Elijah Newren
On Mon, Feb 5, 2018 at 12:00 PM, Stefan Beller wrote: > On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: >> Before trying to apply directory renames to paths within the given >> directories, we want to make sure that there aren't conflicts at the >> directory level. There will be additional

Re: [PATCH v7 20/31] merge-recursive: check for directory level conflicts

2018-02-05 Thread Stefan Beller
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > Before trying to apply directory renames to paths within the given > directories, we want to make sure that there aren't conflicts at the > directory level. There will be additional checks at the individual > file level too, which will be ad

[PATCH v7 20/31] merge-recursive: check for directory level conflicts

2018-01-30 Thread Elijah Newren
Before trying to apply directory renames to paths within the given directories, we want to make sure that there aren't conflicts at the directory level. There will be additional checks at the individual file level too, which will be added later. Signed-off-by: Elijah Newren --- merge-recursive.