Switched to a new branch '20250426074251.20557-1-bogorodskiy@gmail.com'
Applying: network: bridge_driver: add BSD implementation
Applying: network: introduce Packet Filter firewall backend
Using index info to reconstruct a base tree...
M	meson.build
M	src/util/virfirewall.h
Falling back to patching base and 3-way merge...
Auto-merging src/util/virfirewall.h
CONFLICT (content): Merge conflict in src/util/virfirewall.h
Auto-merging meson.build
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 network: introduce Packet Filter firewall backend
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".