Switched to a new branch '20180625142053.4118-1-pbonzini@redhat.com'
Applying: testcases: use full path when importing patchewtest
Using index info to reconstruct a base tree...
M	tests/test_diff.py
M	tests/test_git.py
M	tests/test_import.py
M	tests/test_mbox.py
M	tests/test_message.py
M	tests/test_model.py
M	tests/test_project.py
M	tests/test_rest.py
M	tests/test_tags.py
M	tests/test_testing.py
Falling back to patching base and 3-way merge...
Auto-merging tests/test_testing.py
CONFLICT (content): Merge conflict in tests/test_testing.py
error: Failed to merge in the changes.
Patch failed at 0001 testcases: use full path when importing patchewtest
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".
Failed to apply patch:
[Patchew-devel] [PATCH v2] testcases: use full path when importing patchewtest