On Thu, 13 Feb 2014 15:53:30 +0100 Markus Armbruster <arm...@redhat.com> wrote:
> Wenchao Xia <xiaw...@linux.vnet.ibm.com> writes: > > > Test for inherit and complex union. > > This patch conflicts badly with my test coverage work in "[PATCH v2 > 00/13] qapi: Test coverage & clean up generated code". My series > systematically covers code generation in scripts/qapi*py, and that takes > me seven patches. > > If I put your patch first, mine all explode, and I get to start over. > > Putting my series first looks far easier to resolve, because only this > one patch conflicts. Would you mind me rebasing your series on top of > mine? If it's only this patch that causes conflicts, what about the following: 1. I apply patches 1-8 plus patch 10 2. Markus rebases patch 9 and adds it to his series 3. Markus post a new version Does this work for everyone? The only drawback is that both series will miss today's boat, but this would happen at this point anyway.
