Re: [PATCH v3 0/6] [GSoC] bitmap: integrate a lookup table extension to the bitmap format

From: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Date: Jul 7, 2022, 18:09 UTC
Message-ID: <7f7e8d91-47bc-ede4-a552-2ddc9fe98a1e@gmail.com>
In-Reply-To: <20220707084818.79881-1-chakrabortyabhradeep79@gmail.com>

On 07-07-2022 14:18, Abhradeep Chakraborty wrote:

Show 11 quoted lines

> 
> Junio C Hamano <gitster@pobox.com> wrote:
> 
>>>  Documentation/technical/bitmap-format.txt |  39 ++
>>
>> I haven't tried merging it yet, but doesn't [1/6] overlap with and
>> semantically depend on your other series that touch the formatting
>> of this file?
> 
> Correct, [1/6] indeed depends on my previous patch series[2] and it
> is assuming that that series has already been merged.

I suppose it's the opposite. A quick check shows that the patch applies cleanly over 'master' but fails to apply over 'next' which has the changes from your other patch series. So, the base branch for [1/6] is 'master'. The other 5 patches clearly don't conflict.

> As far as it seems,
> it will not create any merge conflicts while merging but I am not sure.
> This would be interesting to see.
>

Since the first hunk of 1/6 and your other series touch the same area of Documentation/technical/bitmap-format.txt, the changes conflict. Junio might be able to handle this one. If not, you would need to look into separate 1/6 and based it over your other series to avoid the conflict.

-- Sivaraam