Re: [PATCH v10 00/36] Add directory rename detection to git

From: Elijah Newren <newren@gmail.com>
Date: Apr 19, 2018, 20:22 UTC
Message-ID: <CABPp-BFFLHwdgrcg0K=j2Q_oGhQPwVdRJf72zbxB_5U2aAqgoQ@mail.gmail.com>
In-Reply-To: <CABPp-BEhfMPNEtAvdc3MsX5mWsq=YT_=rVeOzCfidJde7Mhh-Q@mail.gmail.com>

On Thu, Apr 19, 2018 at 11:35 AM, Elijah Newren <newren@gmail.com> wrote:

Show 12 quoted lines

> On Thu, Apr 19, 2018 at 10:57 AM, Elijah Newren <newren@gmail.com> wrote:
>> This series is a reboot of the directory rename detection series that was
>> merged to master and then reverted due to the final patch having a buggy
>> can-skip-update check, as noted at
>>   https://public-inbox.org/git/xmqqmuya43cs.fsf@gitster-ct.c.googlers.com/
>> This series based on top of master.
>
> ...and merges cleanly to next but apparently has some minor conflicts
> with both ds/lazy-load-trees and ps/test-chmtime-get from pu.
>
> What's the preferred way to resolve this?  Rebase and resubmit my
> series on pu, or something else?

Sorry, user error; there are no conflicts with my series.

(I accidentally included Junio's interim round of my own series and while trying to spot problems I saw commits from these other series touching relevant files in what looked like nearby areas. Directly merging with these other two series or even merging all of pu before en/rename-directory-detection-reboot followed by individually merging later series has no conflicts with any of my changes.)