Switched to a new branch '20250604123215.34281-1-kshcheti@redhat.com' Applying: conf: VNC graphics parse refactor Applying: conf: SDL fullscreen option refactor Applying: conf: RDP graphics parse refactor Using index info to reconstruct a base tree... M src/qemu/qemu_process.c M src/qemu/qemu_validate.c Falling back to patching base and 3-way merge... Auto-merging src/qemu/qemu_validate.c CONFLICT (content): Merge conflict in src/qemu/qemu_validate.c Auto-merging src/qemu/qemu_process.c CONFLICT (content): Merge conflict in src/qemu/qemu_process.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 conf: RDP graphics parse refactor 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".