From: Duy Nguyen <pclouds@gmail.com>
Date: Wed, 10 Jan 2018 09:26:13 GMT
Subject: Re: [PATCH] status: handle worktree renames
Message-ID: <CACsJy8BgiDrr81FFM8-Wh2ufbPAaqVzncEp9ReB1N8hz8WtF1Q@mail.gmail.com>
In-Reply-To: <3a8169b4-1d7f-35dc-eb23-49afdaa3bf52@jeffhostetler.com>

On Wed, Jan 3, 2018 at 4:14 AM, Jeff Hostetler <git@jeffhostetler.com> wrote:
> Also, does this introduce any new cases for reporting conflicts?
> I haven't really thought about it too much yet, but if there was a
> divergent rename in both branches of a merge, do we now have to handle
> showing possibly 4 pathnames for a file?  (merge-base, branch-a,
> branch-b, worktree)

It's an interesting question but unfortunately I don't have an answer
(I read your mail earlier but waited for so long because I didn't know
the answer then).
-- 
Duy