qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Handling merge conflicts [was Re: [Qemu-devel] [PATCH 00/19 v2] Add


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:25:07 +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,

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]