Switched to a new branch 'cover.1725439083.git.mkletzan@redhat.com' Applying: virnetdevtap: Do (not) use NULLSTR consistently Using index info to reconstruct a base tree... M src/util/virnetdevtap.c Falling back to patching base and 3-way merge... Auto-merging src/util/virnetdevtap.c CONFLICT (content): Merge conflict in src/util/virnetdevtap.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 virnetdevtap: Do (not) use NULLSTR consistently 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".