=== Applying patches on top of PostgreSQL commit ID ae0e1be9f2a20f6b64072dcee5b8dd7b9027a8fa ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Sep 12 12:17:18 UTC 2025
On branch cf/6036
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Update-parser-README-to-include-parse_jsontable.c.patch ===
Applying: Update parser README to include parse_jsontable.c
Using index info to reconstruct a base tree...
M	src/backend/parser/README
Falling back to patching base and 3-way merge...
Auto-merging src/backend/parser/README
CONFLICT (content): Merge conflict in src/backend/parser/README
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update parser README to include parse_jsontable.c
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/parser/README
=== using patch(1) to apply patch ./0001-Update-parser-README-to-include-parse_jsontable.c.patch ===
patching file src/backend/parser/README
Hunk #1 FAILED at 20.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/parser/README.rej
Removing src/backend/parser/README.rej
=== using 'git apply' to apply patch ./0001-Update-parser-README-to-include-parse_jsontable.c.patch ===
Applied patch to 'src/backend/parser/README' with conflicts.
U src/backend/parser/README
diff --cc src/backend/parser/README
index e26eb437a9f,dec207bbfd6..00000000000
--- a/src/backend/parser/README
+++ b/src/backend/parser/README
@@@ -20,7 -20,7 +20,11 @@@ parse_cte.c	handle Common Table Express
  parse_expr.c	handle expressions like col, col + 3, x = 3 or x = 4
  parse_enr.c	handle ephemeral named rels (trigger transition tables, ...)
  parse_func.c	handle functions, table.column and column identifiers
++<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ours
 +parse_jsontable.c handle JSON_TABLE
++================================================
+ parse_jsontable.c	handle JSON table expressions (JSON_TABLE function)
++>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> theirs
  parse_merge.c	handle MERGE
  parse_node.c	create nodes for various structures
  parse_oper.c	handle operators in expressions