From: Stefan Beller <sbeller@google.com>
Date: Mon, 05 Feb 2018 20:02:09 GMT
Subject: Re: [PATCH v7 21/31] merge-recursive: add a new hashmap for storing file collisions
Message-ID: <CAGZ79kYsyWdW+D_5xx4fiqOXyAQZdS5cYGHUhcqB1MKCNf9drQ@mail.gmail.com>
In-Reply-To: <20180130232533.25846-22-newren@gmail.com>

On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren <newren@gmail.com> 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.  We need a way to check for and report on such
> collisions; this hashmap will be used for this purpose.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---

The same comment on compiling applies here.
Nice to review, but it may not compile due to unused functions
that a strict compiler may not be happy about.