=== Applying patches on top of PostgreSQL commit ID 412f78c66eedbe9cf41a657f4566d86a69ab7af2 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Feb 22 20:47:23 UTC 2026
On branch cf/6509
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-DOCS-pg_walsummary-filename-parameter.patch ===
Applying: DOCS - pg_walsummary filename parameter
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/pg_walsummary.sgml
Falling back to patching base and 3-way merge...
Auto-merging doc/src/sgml/ref/pg_walsummary.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ref/pg_walsummary.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 DOCS - pg_walsummary filename parameter
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/ref/pg_walsummary.sgml
=== using patch(1) to apply patch ./v1-0001-DOCS-pg_walsummary-filename-parameter.patch ===
patching file doc/src/sgml/ref/pg_walsummary.sgml
Hunk #1 FAILED at 23.
Hunk #2 succeeded at 56 with fuzz 2.
1 out of 2 hunks FAILED -- saving rejects to file doc/src/sgml/ref/pg_walsummary.sgml.rej
Unstaged changes after reset:
M	doc/src/sgml/ref/pg_walsummary.sgml
Removing doc/src/sgml/ref/pg_walsummary.sgml.rej
=== using 'git apply' to apply patch ./v1-0001-DOCS-pg_walsummary-filename-parameter.patch ===
Applied patch to 'doc/src/sgml/ref/pg_walsummary.sgml' with conflicts.
U doc/src/sgml/ref/pg_walsummary.sgml
diff --cc doc/src/sgml/ref/pg_walsummary.sgml
index 3f3c5ae16a2,c6cd6838fcc..00000000000
--- a/doc/src/sgml/ref/pg_walsummary.sgml
+++ b/doc/src/sgml/ref/pg_walsummary.sgml
@@@ -60,8 -60,8 +60,13 @@@ PostgreSQL documentatio
        <term><replaceable class="parameter">filename</replaceable></term>
        <listitem>
         <para>
++<<<<<<< ours
 +        Specifies the name of a WAL summary file, found in the
 +        <literal>pg_wal/summaries</literal> subdirectory of the data directory.
++=======
+         A binary WAL summary file, found in the <literal>pg_wal/summaries</literal>
+         subdirectory of the data directory.
++>>>>>>> theirs
         </para>
        </listitem>
       </varlistentry>