|
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 20:29:35 +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 |
On 10/28/09 17:24, Avi Kivity wrote:
That would require a series to be merged within a very short time period which does not allow appropriate review on the list.Why? When you detect the conflict, ask the unlucky second to rebase (on top of some git branch). The rebased series doesn't need a re-review unless the submitter says he needed to rework it significantly.
I fully agree here. For a new version of a patch (series) where the only change is rebasing and resolving conflicts I don't see the point in requiring another full week for review.
cheers Gerd
[Prev in Thread] | Current Thread | [Next in Thread] |