=== Applying patches on top of PostgreSQL commit ID 04f9ea372a20c0346ad6d78de348543375761aaa ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Apr 20 08:49:21 UTC 2026
On branch cf/6556
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-refactor-Simplify-ExecWithoutOverlapsNotEmpty-functi.patch ===
Applying: refactor: Simplify ExecWithoutOverlapsNotEmpty function signature and update related calls
Using index info to reconstruct a base tree...
M	src/backend/executor/execIndexing.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/executor/execIndexing.c
CONFLICT (content): Merge conflict in src/backend/executor/execIndexing.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 refactor: Simplify ExecWithoutOverlapsNotEmpty function signature and update related calls
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-refactor-Simplify-ExecWithoutOverlapsNotEmpty-functi.patch ===
patching file src/backend/executor/execIndexing.c
Hunk #1 FAILED at 115.
Hunk #2 succeeded at 146 (offset 1 line).
Hunk #3 FAILED at 753.
Hunk #4 succeeded at 1159 (offset 10 lines).
2 out of 4 hunks FAILED -- saving rejects to file src/backend/executor/execIndexing.c.rej
Unstaged changes after reset:
M	src/backend/executor/execIndexing.c
Removing src/backend/executor/execIndexing.c.rej
=== using 'git apply' to apply patch ./0001-refactor-Simplify-ExecWithoutOverlapsNotEmpty-functi.patch ===
Applied patch to 'src/backend/executor/execIndexing.c' with conflicts.
U src/backend/executor/execIndexing.c
diff --cc src/backend/executor/execIndexing.c
index eb383812901,5474061c7b7..00000000000
--- a/src/backend/executor/execIndexing.c
+++ b/src/backend/executor/execIndexing.c
@@@ -754,18 -754,10 +754,25 @@@ check_exclusion_or_unique_constraint(Re
  		{
  			TupleDesc	tupdesc = RelationGetDescr(heap);
  			Form_pg_attribute att = TupleDescAttr(tupdesc, attno - 1);
++<<<<<<< ours
 +			TypeCacheEntry *typcache = lookup_type_cache(att->atttypid,
 +														 TYPECACHE_DOMAIN_BASE_INFO);
 +			char		typtype;
 +
 +			if (OidIsValid(typcache->domainBaseType))
 +				typtype = get_typtype(typcache->domainBaseType);
 +			else
 +				typtype = typcache->typtype;
 +
 +			ExecWithoutOverlapsNotEmpty(heap, att->attname,
 +										values[indnkeyatts - 1],
 +										typtype, att->atttypid);
++=======
+ 
+ 			ExecWithoutOverlapsNotEmpty(heap, att->attname,
+ 										values[indnkeyatts - 1],
+ 										get_typtype(att->atttypid));
++>>>>>>> theirs
  		}
  	}