thinko in basic_archive.c

Applying: Refactor copy_file() to remove leftover temp files in basic_archive
Using index info to reconstruct a base tree...
M	contrib/basic_archive/basic_archive.c
M	src/backend/storage/file/copydir.c
M	src/backend/storage/file/reinit.c
M	src/include/storage/copydir.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/storage/copydir.h
CONFLICT (content): Merge conflict in src/include/storage/copydir.h
Auto-merging src/backend/storage/file/reinit.c
Auto-merging src/backend/storage/file/copydir.c
CONFLICT (content): Merge conflict in src/backend/storage/file/copydir.c
Auto-merging contrib/basic_archive/basic_archive.c
CONFLICT (content): Merge conflict in contrib/basic_archive/basic_archive.c
Patch failed at 0001 Refactor copy_file() to remove leftover temp files in basic_archive

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"