Re: [PATCH 0/5] Parallel Checkout (part 2)

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 19, 2021, 22:58 UTC
Message-ID: <xmqqsg4qlpip.fsf@gitster.g>
In-Reply-To: <19fee535ee0ec5211f22b2b69a4a9804816c2322.1616122653.git.matheus.bernardino@usp.br>

Matheus Tavares <matheus.bernardino@usp.br> writes:

Show 11 quoted lines

>> Let's redo part-1 on top of 'master' first without such a merge; it
>> has been out of 'next' so we can do so easily without wanting for
>> the tip of 'next' to get rewound.
>
> Thanks!
>
> I saw you've added the "entry.h" inclusion that was missing at
> builtin/stash when merging this branch on 'seen'. However, now that
> part-1 is based on 'master', the branch is no longer buildable without
> this fix. So could we perhaps squash this change directly into the
> relevant commit in this series?

Yeah, that was the kind of thing I had in mind when I suggested you to "Let's redo part-1 on top of 'master'".

I'll mark the topic to be "expecting a reroll" for now, as I am deep in today's integration cycle.

Thanks.