Switched to a new branch '20250325062942.31687-1-tcosprojects@gmail.com'
Applying: libxl_conf: Implement hyperv domain flags for Xen
Using index info to reconstruct a base tree...
M	docs/formatdomain.rst
M	src/libxl/libxl_conf.c
M	tests/libxlxml2domconfigtest.c
Falling back to patching base and 3-way merge...
Auto-merging tests/libxlxml2domconfigtest.c
CONFLICT (content): Merge conflict in tests/libxlxml2domconfigtest.c
Auto-merging docs/formatdomain.rst
CONFLICT (content): Merge conflict in docs/formatdomain.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 libxl_conf: Implement hyperv domain flags for Xen
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".