=== Applying patches on top of PostgreSQL commit ID 5eed8ce50ce9df1067b95593dde9f4fc526dfc72 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Nov 22 16:43:21 UTC 2025
On branch cf/6234
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Introduce-a-new-GUC-logical_wal_sender_shutdown_mode.patch ===
Applying: Introduce a new GUC 'logical_wal_sender_shutdown_mode'.
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	src/backend/utils/misc/postgresql.conf.sample
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/misc/postgresql.conf.sample
CONFLICT (content): Merge conflict in src/backend/utils/misc/postgresql.conf.sample
Auto-merging doc/src/sgml/config.sgml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Introduce a new GUC 'logical_wal_sender_shutdown_mode'.
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	doc/src/sgml/config.sgml
M	src/backend/replication/walsender.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/guc_tables.c
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/replication/walsender.h
Removing src/test/recovery/t/050_walsnd_immediate_shutdown.pl
=== using patch(1) to apply patch ./0001-Introduce-a-new-GUC-logical_wal_sender_shutdown_mode.patch ===
patching file doc/src/sgml/config.sgml
patching file src/backend/replication/walsender.c
patching file src/backend/utils/misc/guc_parameters.dat
patching file src/backend/utils/misc/guc_tables.c
patching file src/backend/utils/misc/postgresql.conf.sample
Hunk #1 FAILED at 346.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/misc/postgresql.conf.sample.rej
patching file src/include/replication/walsender.h
patching file src/test/recovery/t/050_walsnd_immediate_shutdown.pl
Unstaged changes after reset:
M	doc/src/sgml/config.sgml
M	src/backend/replication/walsender.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/guc_tables.c
M	src/include/replication/walsender.h
Removing src/backend/utils/misc/postgresql.conf.sample.rej
Removing src/test/recovery/t/050_walsnd_immediate_shutdown.pl
=== using 'git apply' to apply patch ./0001-Introduce-a-new-GUC-logical_wal_sender_shutdown_mode.patch ===
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'src/backend/replication/walsender.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' with conflicts.
Applied patch to 'src/include/replication/walsender.h' cleanly.
Falling back to direct application...
U src/backend/utils/misc/postgresql.conf.sample
diff --cc src/backend/utils/misc/postgresql.conf.sample
index dc9e2255f8a,66285974f32..00000000000
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@@ -336,16 -336,17 +336,30 @@@
  
  # Set these on the primary and on any standby that will send replication data.
  
++<<<<<<< ours
 +#max_wal_senders = 10           # max number of walsender processes
 +                                # (change requires restart)
 +#max_replication_slots = 10     # max number of replication slots
 +                                # (change requires restart)
 +#wal_keep_size = 0              # in megabytes; 0 disables
 +#max_slot_wal_keep_size = -1    # in megabytes; -1 disables
 +#idle_replication_slot_timeout = 0      # in seconds; 0 disables
 +#wal_sender_timeout = 60s       # in milliseconds; 0 disables
 +#track_commit_timestamp = off   # collect timestamp of transaction commit
 +                                # (change requires restart)
++=======
+ #max_wal_senders = 10		# max number of walsender processes
+ 				# (change requires restart)
+ #max_replication_slots = 10	# max number of replication slots
+ 				# (change requires restart)
+ #wal_keep_size = 0		# in megabytes; 0 disables
+ #max_slot_wal_keep_size = -1	# in megabytes; -1 disables
+ #idle_replication_slot_timeout = 0	# in seconds; 0 disables
+ #wal_sender_timeout = 60s	# in milliseconds; 0 disables
+ #track_commit_timestamp = off	# collect timestamp of transaction commit
+ 				# (change requires restart)
+ #logical_wal_sender_shutdown_mode = wait_flush
++>>>>>>> theirs
  
  # - Primary Server -