Switched to a new branch 'cover.1732039836.git.jdenemar@redhat.com'
Applying: cpu_x86: Copy added and removed features from ancestor
Using index info to reconstruct a base tree...
M	src/cpu/cpu_x86.c
Falling back to patching base and 3-way merge...
Auto-merging src/cpu/cpu_x86.c
Applying: sync_qemu_features_i386: Add some removed features back
Using index info to reconstruct a base tree...
M	src/cpu_map/sync_qemu_features_i386.py
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: sync_qemu_models_i386: Use f-strings
Using index info to reconstruct a base tree...
M	src/cpu_map/sync_qemu_models_i386.py
Falling back to patching base and 3-way merge...
Auto-merging src/cpu_map/sync_qemu_models_i386.py
CONFLICT (content): Merge conflict in src/cpu_map/sync_qemu_models_i386.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 sync_qemu_models_i386: Use f-strings
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".