Switched to a new branch '20181127184829.32520-1-pbonzini@redhat.com' Applying: tests: fix test_tags for Python < 3.6 error: Failed to merge in the changes. Using index info to reconstruct a base tree... M tests/test_tags.py Falling back to patching base and 3-way merge... Auto-merging tests/test_tags.py CONFLICT (content): Merge conflict in tests/test_tags.py Patch failed at 0001 tests: fix test_tags for Python < 3.6 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] tests: fix test_tags for Python < 3.6