Switched to a new branch '20241002010314.1928515-1-dbarboza@ventanamicro.com'
Applying: exec/memtxattr: add process identifier to the transaction attributes
Using index info to reconstruct a base tree...
M	include/exec/memattrs.h
Falling back to patching base and 3-way merge...
Auto-merging include/exec/memattrs.h
CONFLICT (content): Merge conflict in include/exec/memattrs.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 exec/memtxattr: add process identifier to the transaction attributes
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".