|
From: | Gerd Hoffmann |
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 15:57:10 +0100 |
User-agent: | Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.4pre) Gecko/20091014 Fedora/3.0-2.8.b4.fc11 Lightning/1.0pre Thunderbird/3.0b4 |
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.
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.
cheers, Gerd
[Prev in Thread] | Current Thread | [Next in Thread] |