=== Applying patches on top of PostgreSQL commit ID 7a04cac0c3b376922daa7e3b5d5c628aa0e661ba ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Oct 25 17:23:26 UTC 2026
On branch cf/7489
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Fix-GIN-lookups-for-root-strings-in-strict-jsonpa.patch ===
Applying: Fix GIN lookups for root strings in strict jsonpath queries
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/jsonb_gin.c
M	src/test/regress/expected/jsonb.out
M	src/test/regress/sql/jsonb.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/jsonb.sql
Auto-merging src/test/regress/expected/jsonb.out
Auto-merging src/backend/utils/adt/jsonb_gin.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/jsonb_gin.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 Fix GIN lookups for root strings in strict jsonpath queries
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 ./v1-0001-Fix-GIN-lookups-for-root-strings-in-strict-jsonpa.patch ===
patching file src/backend/utils/adt/jsonb_gin.c
Hunk #1 FAILED at 442.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/adt/jsonb_gin.c.rej
patching file src/test/regress/expected/jsonb.out
patching file src/test/regress/sql/jsonb.sql
Unstaged changes after reset:
M	src/test/regress/expected/jsonb.out
M	src/test/regress/sql/jsonb.sql
Removing src/backend/utils/adt/jsonb_gin.c.rej
=== using 'git apply' to apply patch ./v1-0001-Fix-GIN-lookups-for-root-strings-in-strict-jsonpa.patch ===
Applied patch to 'src/backend/utils/adt/jsonb_gin.c' with conflicts.
Applied patch to 'src/test/regress/expected/jsonb.out' cleanly.
Applied patch to 'src/test/regress/sql/jsonb.sql' cleanly.
U src/backend/utils/adt/jsonb_gin.c
diff --cc src/backend/utils/adt/jsonb_gin.c
index 51ed2994bb0,e1cc7df6674..00000000000
--- a/src/backend/utils/adt/jsonb_gin.c
+++ b/src/backend/utils/adt/jsonb_gin.c
@@@ -443,7 -442,10 +443,14 @@@ jsonb_ops__extract_nodes(JsonPathGinCon
  			if (cxt->lax)
  				key_entry = GIN_MAYBE;
  			else if (!last)		/* root ($) */
++<<<<<<< ours
 +				key_entry = GIN_TRUE;
++=======
+ 			{
+ 				/* Root scalars are stored as single-element arrays. */
+ 				key_entry = GIN_TRUE;
+ 			}
++>>>>>>> theirs
  			else if (last->type == jpiAnyArray || last->type == jpiIndexArray)
  				key_entry = GIN_TRUE;
  			else if (last->type == jpiAny)