=== Applying patches on top of PostgreSQL commit ID 144ad723a4484927266a316d1c9550d56745ff67 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Jul 6 01:28:20 UTC 2025 On branch cf/5735 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-pg_creating_extension-to-inspect-if-an-extension-is-.patch === Applying: pg_creating_extension() to inspect if an extension is being created. Using index info to reconstruct a base tree... M src/backend/commands/extension.c M src/include/catalog/pg_proc.dat Falling back to patching base and 3-way merge... Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/commands/extension.c CONFLICT (content): Merge conflict in src/backend/commands/extension.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 pg_creating_extension() to inspect if an extension is being created. 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". Unstaged changes after reset: M src/backend/commands/extension.c M src/include/catalog/pg_proc.dat === using patch(1) to apply patch ./v1-0001-pg_creating_extension-to-inspect-if-an-extension-is-.patch === patching file src/backend/commands/extension.c Hunk #1 succeeded at 3904 with fuzz 2 (offset 41 lines). patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 10737 (offset 10 lines). [cf/5735 42a00f860c3] pg_creating_extension() to inspect if an extension is being created. Author: Yurii Rashkovskii Date: Fri Apr 18 17:54:58 2025 -0700 2 files changed, 15 insertions(+)