Switched to a new branch '20220222140141.190989-1-pbonzini@redhat.com'
Applying: www: allow more customization of the series list
Using index info to reconstruct a base tree...
M	www/templates/series-list.html
M	www/views.py
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: maintainer: allow showing queue in series-list format
Using index info to reconstruct a base tree...
M	mods/maintainer.py
M	www/templates/my-queues.html
Falling back to patching base and 3-way merge...
Auto-merging mods/maintainer.py
CONFLICT (content): Merge conflict in mods/maintainer.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 maintainer: allow showing queue in series-list format
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 2/3] maintainer: allow showing queue in series-list format