Thanks for your reply! I'm glad to understand where problem lies. Su Hang
> -----Original Messages----- > From: "Fam Zheng" <f...@redhat.com> > Sent Time: 2018-03-16 15:08:19 (Friday) > To: "Su Hang" <suhan...@mails.ucas.ac.cn> > Cc: peter.mayd...@linaro.org, vsement...@virtuozzo.com, qemu-devel@nongnu.org > Subject: Re: [Qemu-devel] [PATCH v2] scripts/checkpatch.pl: Bug fix > > 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/1521169105-32041-1-git-send-email-suhan...@mails.ucas.ac.cn/ > > Fam
