Switched to a new branch '127e826b629c8fb75e2da132da0c606019428385.1729177319.git.pkrempa@redhat.com' Applying: qemu: Give the users possibility to overwrite temp files for disk Using index info to reconstruct a base tree... M docs/formatdomain.rst M src/conf/domain_conf.c M src/conf/domain_conf.h M src/conf/schemas/domaincommon.rng M src/qemu/qemu_snapshot.c Falling back to patching base and 3-way merge... Auto-merging src/qemu/qemu_snapshot.c CONFLICT (content): Merge conflict in src/qemu/qemu_snapshot.c Auto-merging src/conf/schemas/domaincommon.rng Auto-merging src/conf/domain_conf.h Auto-merging src/conf/domain_conf.c Auto-merging docs/formatdomain.rst CONFLICT (content): Merge conflict in docs/formatdomain.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 qemu: Give the users possibility to overwrite temp files for disk 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".