[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2] scripts/checkpatch.pl: Bug fix
|
From: |
Fam Zheng |
|
Subject: |
Re: [Qemu-devel] [PATCH v2] scripts/checkpatch.pl: Bug fix |
|
Date: |
Fri, 16 Mar 2018 15:08:19 +0800 |
|
User-agent: |
Mutt/1.9.2 (2017-12-15) |
On Fri, 03/16 14:31, Su Hang wrote:
> Because I generate my first patch on master, it should work.
Nope. "git am" doesn't know to resolve the conflict automatically despite it
being straightforward, unfortunately:
http://patchew.org/QEMU/address@hidden/
Fam