=== Applying patches on top of PostgreSQL commit ID 5142f0093e648d1a32fdcc7c835d17fa103e1239 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Apr 20 00:18:23 UTC 2026
On branch cf/5270
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v18-0001-Rename-jsonpath-method-arg-tokens.patch ===
Applying: Rename jsonpath method arg tokens
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/jsonpath_gram.y
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/adt/jsonpath_gram.y
CONFLICT (content): Merge conflict in src/backend/utils/adt/jsonpath_gram.y
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Rename jsonpath method arg tokens
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 ./v18-0001-Rename-jsonpath-method-arg-tokens.patch ===
patching file src/backend/utils/adt/jsonpath_gram.y
Hunk #1 FAILED at 92.
Hunk #2 FAILED at 254.
Hunk #3 FAILED at 268.
Hunk #4 FAILED at 289.
4 out of 4 hunks FAILED -- saving rejects to file src/backend/utils/adt/jsonpath_gram.y.rej
Removing src/backend/utils/adt/jsonpath_gram.y.rej
=== using 'git apply' to apply patch ./v18-0001-Rename-jsonpath-method-arg-tokens.patch ===
Applied patch to 'src/backend/utils/adt/jsonpath_gram.y' with conflicts.
U src/backend/utils/adt/jsonpath_gram.y
diff --cc src/backend/utils/adt/jsonpath_gram.y
index f826697d098,eb449aa3709..00000000000
--- a/src/backend/utils/adt/jsonpath_gram.y
+++ b/src/backend/utils/adt/jsonpath_gram.y
@@@ -97,7 -95,7 +97,11 @@@ static bool makeItemLikeRegex(JsonPathP
  					str_elem opt_str_arg int_elem
  					uint_elem opt_uint_arg
  
++<<<<<<< ours
 +%type	<elems>		accessor_expr int_list opt_int_list str_int_args str_str_args
++=======
+ %type	<elems>		accessor_expr int_list opt_int_list
++>>>>>>> theirs
  
  %type	<indexs>	index_list