Re: What's cooking in git.git (Jun 2020, #05; Thu, 25)

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 26, 2020, 14:45 UTC
Message-ID: <xmqqwo3thome.fsf@gitster.c.googlers.com>
In-Reply-To: <20200626084315.GB84491@Carlos-MBP>

Carlo Marcelo Arenas Belón <carenas@gmail.com> writes:

Show 8 quoted lines

>> Hmph, Does it break if it is merged alone to 'master' without these
>> other two topics?  I somehow thought I disentangled the topic from
>> unnecessary dependencies before queuing it, but it is possible that
>> I misremember...
>
> Doesn't break and applies perfectly on its own, or in any order with
> rs/pull-leakfix, but will conflict with rs/commit-reach-leakfix with
> the obvious conflict resolution needed:

Yes, that is what I meant. I checked if it can graduate by itself without getting taken hostage of other topics, while ensuring that the conflict is simple enough that once done correctly while merging to 'next', the resolution can be reused when merging to 'master'. Which means that, as long as the resolution you see in 'next' is correct, what is queued is good.

Thanks for double checking.