=== Applying patches on top of PostgreSQL commit ID 9d8cdcbe0c8aee743e29079bdb2e4b5eeae4c70e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Jun  9 16:12:24 UTC 2026
On branch cf/6846
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Use-correct-type-for-catalog_xmin.patch ===
Applying: Use correct type for catalog_xmin
Using index info to reconstruct a base tree...
M	src/backend/replication/logical/slotsync.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/replication/logical/slotsync.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/slotsync.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 Use correct type for catalog_xmin
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-Use-correct-type-for-catalog_xmin.patch ===
patching file src/backend/replication/logical/slotsync.c
Hunk #1 FAILED at 340.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/replication/logical/slotsync.c.rej
Removing src/backend/replication/logical/slotsync.c.rej
=== using 'git apply' to apply patch ./v1-0001-Use-correct-type-for-catalog_xmin.patch ===
Applied patch to 'src/backend/replication/logical/slotsync.c' with conflicts.
U src/backend/replication/logical/slotsync.c
diff --cc src/backend/replication/logical/slotsync.c
index 96107c9475d,8cec8a49fb2..00000000000
--- a/src/backend/replication/logical/slotsync.c
+++ b/src/backend/replication/logical/slotsync.c
@@@ -340,7 -340,7 +340,11 @@@ update_local_synced_slot(RemoteSlot *re
  			bool		found_consistent_snapshot;
  			XLogRecPtr	old_confirmed_lsn = slot->data.confirmed_flush;
  			XLogRecPtr	old_restart_lsn = slot->data.restart_lsn;
++<<<<<<< ours
 +			TransactionId old_catalog_xmin = slot->data.catalog_xmin;
++=======
+ 			TransactionId	old_catalog_xmin = slot->data.catalog_xmin;
++>>>>>>> theirs
  
  			LogicalSlotAdvanceAndCheckSnapState(remote_slot->confirmed_lsn,
  												&found_consistent_snapshot);