On 3/7/19 11:23 AM, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <arm...@redhat.com> > > # Conflicts: > # vl.c
How'd you get git to preserve the leading #? Generally, I find conflicts details useful for cherry-picked backports, but pointless for rebased patches intended as original upstream material. And git defaults to stripping lines with leading # when composing a commit message. May be worth cleaning up before the actual pull request. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
