|
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:19:32 +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 |
Neither of these problems existed in the patches Gerd and I posted, so presumably they came about by trying to merge the two patch sets?It means I squashed the resolutions incorrectly. I could add a bisectability test but that would take a long time to run...
Indeed.
How can we avoid this happening in future? What process could we have used to avoid it?There are a few ways. This was all sitting in staging for quite some time so poking at staging proactively could have helped.
I stopped looking at staging. You stuff almost everything you find on the list into staging, so seeing patches queued up there doesn't indicate anything ...
cheers, Gerd
[Prev in Thread] | Current Thread | [Next in Thread] |