Switched to a new branch '743f49aa667640f276d5fc050a9760cef3b61bc8.1742550634.git.jtomko@redhat.com' Applying: NEWS: fix even more typos Using index info to reconstruct a base tree... M NEWS.rst Falling back to patching base and 3-way merge... Auto-merging NEWS.rst CONFLICT (content): Merge conflict in NEWS.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 NEWS: fix even more typos 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".