Re: REPACK (CONCURRENTLY) decoding worker is canceled by lock_timeout

Applying: Pass the backend's timeout settings to the REPACK decoding worker
Using index info to reconstruct a base tree...
M	src/backend/commands/repack.c
M	src/backend/commands/repack_worker.c
M	src/include/commands/repack_internal.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/commands/repack_internal.h
Auto-merging src/backend/commands/repack_worker.c
Auto-merging src/backend/commands/repack.c
CONFLICT (content): Merge conflict in src/backend/commands/repack.c
Patch failed at 0001 Pass the backend's timeout settings to the REPACK decoding worker

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"