|Subject:||Re: Handling merge conflicts [was Re: [Qemu-devel] [PATCH 00/19 v2] Add virtio-net/tap support for partial csums and GSO]|
|Date:||Wed, 28 Oct 2009 10:28:37 -0500|
|User-agent:||Thunderbird 22.214.171.124 (X11/20090825)|
Gerd Hoffmann wrote:
Hi,Should either Gerd or I have merged the others' changes into our tree and asked you to pull? Should you just refuse conflicts and ask us to re-post? Or ...?I think the best way to deal with that would be to simply not merge stuff which doesn't apply. Likewise for stuff which doesn't build.Pick one patch series, merge it, ask for a rebase of the other series, i.e. basically offload the conflict resolving to the patch submitter. Reduces your workload and non-trivial conflicts are better handled by the submitter anyway.
That would require a series to be merged within a very short time period which does not allow appropriate review on the list.
Problem is that this model doesn't work very well the bulk merges we have right now, so I'd suggest to also merge smaller batches more frequently.
There are certain patches that I could merge more quickly but I don't think it's reasonable to merge large, potentially controversial series without letting them sit on the list for a week or so to give people a chance to review. In this case, these two series definitely fall into the later category.
Regards, Anthony Liguori
|[Prev in Thread]||Current Thread||[Next in Thread]|