Switched to a new branch '38fa5735d96972b79738179555715698d9a6712a.1721122769.git.ajulis@redhat.com'
Applying: conf: virtiofs: add rlimit_nofile element
Using index info to reconstruct a base tree...
M	docs/formatdomain.rst
M	src/conf/domain_conf.c
M	src/conf/domain_conf.h
M	src/conf/schemas/domaincommon.rng
M	tests/qemuxmlconftest.c
Falling back to patching base and 3-way merge...
Auto-merging tests/qemuxmlconftest.c
CONFLICT (add/add): Merge conflict in tests/qemuxmlconfdata/vhost-user-fs-fd-rlimit.x86_64-latest.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 conf: virtiofs: add rlimit_nofile element
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".