Switched to a new branch '20240517173007.8125-1-laine@redhat.com'
Applying: util/network: move viriptables.[ch] from util to network directory
Using index info to reconstruct a base tree...
M	po/POTFILES
M	src/libvirt_private.syms
M	src/network/bridge_driver_linux.c
M	src/network/meson.build
M	src/util/meson.build
A	src/util/viriptables.c
A	src/util/viriptables.h
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): src/util/viriptables.h deleted in HEAD and renamed to src/network/network_iptables.h in util/network: move viriptables.[ch] from util to network directory. Version util/network: move viriptables.[ch] from util to network directory of src/network/network_iptables.h left in tree.
CONFLICT (rename/delete): src/util/viriptables.c deleted in HEAD and renamed to src/network/network_iptables.c in util/network: move viriptables.[ch] from util to network directory. Version util/network: move viriptables.[ch] from util to network directory of src/network/network_iptables.c left in tree.
Auto-merging src/network/meson.build
CONFLICT (content): Merge conflict in src/network/meson.build
Auto-merging src/network/bridge_driver_linux.c
CONFLICT (content): Merge conflict in src/network/bridge_driver_linux.c
Auto-merging src/libvirt_private.syms
Auto-merging po/POTFILES
CONFLICT (content): Merge conflict in po/POTFILES
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 util/network: move viriptables.[ch] from util to network directory
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".