Switched to a new branch '20240919163042.116767-1-peterx@redhat.com'
Applying: migration: Cleanup migrate_fd_cleanup() on accessing to_dst_file
Using index info to reconstruct a base tree...
M	migration/migration.c
Falling back to patching base and 3-way merge...
Auto-merging migration/migration.c
CONFLICT (content): Merge conflict in migration/migration.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 migration: Cleanup migrate_fd_cleanup() on accessing to_dst_file
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".