Switched to a new branch '20241129173120.761728-1-berrange@redhat.com'
Applying: tests/functional: increase timeouts for arm sx1 test
Using index info to reconstruct a base tree...
M	tests/functional/test_arm_sx1.py
Falling back to patching base and 3-way merge...
Auto-merging tests/functional/test_arm_sx1.py
CONFLICT (content): Merge conflict in tests/functional/test_arm_sx1.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 tests/functional: increase timeouts for arm sx1 test
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".