Switched to a new branch '20260424154205.364268-1-berrange@redhat.com' Applying: python: bump qemu.qmp to v0.0.6 Using index info to reconstruct a base tree... M python/scripts/vendor.py M pythondeps.toml Falling back to patching base and 3-way merge... Auto-merging pythondeps.toml Auto-merging python/scripts/vendor.py CONFLICT (content): Merge conflict in python/scripts/vendor.py error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 python: bump qemu.qmp to v0.0.6 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".