[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 8/8] OptsVisitor: introduce unit tests, with tes
|
From: |
Laszlo Ersek |
|
Subject: |
Re: [Qemu-devel] [PATCH 8/8] OptsVisitor: introduce unit tests, with test cases for range flattening |
|
Date: |
Mon, 19 Aug 2013 21:55:03 +0200 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130806 Thunderbird/17.0.8 |
On 08/19/13 21:26, Luiz Capitulino wrote:
> On Mon, 22 Jul 2013 23:07:36 +0200
> Laszlo Ersek <address@hidden> wrote:
>
>>
>> Signed-off-by: Laszlo Ersek <address@hidden>
>
> This patch now conflicts, can you respin please?
Can you retry with "git am -3"?
"git rebase -i" didn't ask me to do anything manually, so I'm guessing
if you let "git am" to do a 3-way merge, it should work.
(Of course I don't have anything against posting a v2, this is just an
attempt to keep the traffic low.)
Thanks!
Laszlo