Switched to a new branch '20260708180508.10752-1-unauthorizen@gmail.com' Applying: docs: drvbhyve: document newly added pf check Using index info to reconstruct a base tree... M docs/drvbhyve.rst Falling back to patching base and 3-way merge... Auto-merging docs/drvbhyve.rst CONFLICT (content): Merge conflict in docs/drvbhyve.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 docs: drvbhyve: document newly added pf check 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".