Switched to a new branch '20241113103553.257800-1-abologna@redhat.com' Applying: docs: Rework documentation for the NSS module Using index info to reconstruct a base tree... M docs/nss.rst Falling back to patching base and 3-way merge... Auto-merging docs/nss.rst CONFLICT (content): Merge conflict in docs/nss.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: Rework documentation for the NSS module 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".