Switched to a new branch '20240918183151.6413-1-peterx@redhat.com'
Applying: tests/qtest/migration: Move a couple of slow tests under g_test_slow
Using index info to reconstruct a base tree...
M	tests/qtest/migration-test.c
Falling back to patching base and 3-way merge...
Auto-merging tests/qtest/migration-test.c
CONFLICT (content): Merge conflict in tests/qtest/migration-test.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 tests/qtest/migration: Move a couple of slow tests under g_test_slow
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".