Switched to a new branch '20201120140803.153272-1-pbonzini@redhat.com' Applying: tweak how the importer limits itself to 100 commits only Using index info to reconstruct a base tree... M patchew-cli Falling back to patching base and 3-way merge... Auto-merging patchew-cli CONFLICT (content): Merge conflict in patchew-cli error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 tweak how the importer limits itself to 100 commits only 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] tweak how the importer limits itself to 100 commits only