Kaartic Sivaraam <kaartic.sivaraam@xxxxxxxxx> wrote: >> 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. Actually by saying "[1/6] indeed depends on my previous patch series[2] and it is assuming that that series has already been merged.", I wanted to mean that the format followed in this patch (e.g. description list, indentation etc.) is dependent on the format changes introduced in that Patch series. If you say about the base branch, yes, you're right. The base branch is 'Master'. > 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. Oh, I see. I have no problem doing that :) Let me know if Junio face any problem fixing the conflict. Thanks :)
