From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N3E93-0004TX-BM for qemu-devel@nongnu.org; Wed, 28 Oct 2009 15:25:21 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N3E8y-0004PN-NV for qemu-devel@nongnu.org; Wed, 28 Oct 2009 15:25:20 -0400 Received: from [199.232.76.173] (port=34545 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N3E8y-0004PG-Hu for qemu-devel@nongnu.org; Wed, 28 Oct 2009 15:25:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19570) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N3E8y-0005Dh-CO for qemu-devel@nongnu.org; Wed, 28 Oct 2009 15:25:16 -0400 Message-ID: <4AE89A93.20905@redhat.com> Date: Wed, 28 Oct 2009 20:25:07 +0100 From: Gerd Hoffmann MIME-Version: 1.0 Subject: Re: Handling merge conflicts [was Re: [Qemu-devel] [PATCH 00/19 v2] Add virtio-net/tap support for partial csums and GSO] References: <1256229830-28066-1-git-send-email-markmc@redhat.com> <1256740226.5105.59.camel@blaa> <4AE862B4.1040605@codemonkey.ws> <1256747374.5105.82.camel@blaa> In-Reply-To: <1256747374.5105.82.camel@blaa> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mark McLoughlin Cc: qemu-devel@nongnu.org Hi, > How about a simple "I've merged Gerd's into staging, yours conflicts, > please re-base" on-list? Then I could reply with "Cool, re-base pushed > to vnet-hdr.v2 in my tree" and you could merge that? Problem with that is that staging is a moving target (i.e. rebases frequently). I'll never ever base any of my branches on staging, this is just asking for trouble. "I've merged into master, please rebase" would work for me though. cheers, Gerd