Switched to a new branch 'cover.1745846174.git.mprivozn@redhat.com' Applying: internal: Introduce ATTRIBUTE_NOIPA Using index info to reconstruct a base tree... M docs/coding-style.rst M scripts/cocci-macro-file.h M src/internal.h Falling back to patching base and 3-way merge... Auto-merging src/internal.h CONFLICT (content): Merge conflict in src/internal.h Auto-merging scripts/cocci-macro-file.h CONFLICT (content): Merge conflict in scripts/cocci-macro-file.h Auto-merging docs/coding-style.rst CONFLICT (content): Merge conflict in docs/coding-style.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 internal: Introduce ATTRIBUTE_NOIPA 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".