=== Applying patches on top of PostgreSQL commit ID 82a7cbea747c465eee8449587be2d6cc47af82fe === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Mar 31 07:49:24 UTC 2026 On branch cf/6431 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Stable-tupDesc_identifier.patch === Applying: Stable tupDesc_identifier. Using index info to reconstruct a base tree... M src/backend/utils/cache/typcache.c Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/cache/typcache.c CONFLICT (content): Merge conflict in src/backend/utils/cache/typcache.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Stable tupDesc_identifier. 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". === using patch(1) to apply patch ./0001-Stable-tupDesc_identifier.patch === patching file src/backend/utils/cache/typcache.c Hunk #2 succeeded at 307 (offset 19 lines). Hunk #3 succeeded at 359 with fuzz 2 (offset 24 lines). Hunk #4 succeeded at 1063 (offset 92 lines). Hunk #5 succeeded at 1938 (offset 114 lines). [cf/6431 bdc923779d9] Stable tupDesc_identifier. Author: Vaibhave Sekar Date: Sun Jan 25 10:34:46 2026 +0000 1 file changed, 104 insertions(+), 7 deletions(-) === using 'git am' to apply patch ./0002-Fix-tests.patch === Applying: Fix tests.