Switched to a new branch 'b46038ab6d74645d0914761cae90a770524d86d9.1728644342.git.jtomko@redhat.com' Applying: Remove pointless bool conversions Using index info to reconstruct a base tree... M src/libxl/libxl_domain.c M src/lxc/lxc_process.c M src/nwfilter/nwfilter_dhcpsnoop.c M src/qemu/qemu_process.c M tools/virsh-snapshot.c Falling back to patching base and 3-way merge... Auto-merging tools/virsh-snapshot.c Auto-merging src/qemu/qemu_process.c CONFLICT (content): Merge conflict in src/qemu/qemu_process.c Auto-merging src/lxc/lxc_process.c CONFLICT (content): Merge conflict in src/lxc/lxc_process.c Auto-merging src/libxl/libxl_domain.c CONFLICT (content): Merge conflict in src/libxl/libxl_domain.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Remove pointless bool conversions When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".