Switched to a new branch '20220222092938.161397-1-pbonzini@redhat.com'
Applying: css: update to fontawesome 5
Using index info to reconstruct a base tree...
M	mods/email.py
M	mods/git.py
M	mods/testing.py
M	static/css/base.css
M	static/css/series-detail.css
M	static/css/series-diff.css
M	www/templates/base.html
M	www/templates/my-queues.html
M	www/templates/project-detail.html
M	www/templates/series-detail.html
M	www/templates/series-diff.html
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in static/css/fontawesome.min.css
Auto-merging static/css/fontawesome.min.css
Auto-merging static/css/base.css
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 css: update to fontawesome 5
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] css: update to fontawesome 5