=== Applying patches on top of PostgreSQL commit ID 1fe0cfddf0e9a658161d03ad256bec0b2a30231d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Nov 13 08:13:29 UTC 2026
On branch cf/7482
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v4-0001-DOCS-Remove-ambiguous-wording-about-ONLY-for-part.patch ===
Applying: DOCS - Remove ambiguous wording about 'ONLY' for partitioned tables.
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/create_publication.sgml
Falling back to patching base and 3-way merge...
Auto-merging doc/src/sgml/ref/create_publication.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ref/create_publication.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 - Remove ambiguous wording about 'ONLY' for partitioned tables.
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 ./v4-0001-DOCS-Remove-ambiguous-wording-about-ONLY-for-part.patch ===
patching file doc/src/sgml/ref/create_publication.sgml
Hunk #1 FAILED at 119.
1 out of 1 hunk FAILED -- saving rejects to file doc/src/sgml/ref/create_publication.sgml.rej
Removing doc/src/sgml/ref/create_publication.sgml.rej
=== using 'git apply' to apply patch ./v4-0001-DOCS-Remove-ambiguous-wording-about-ONLY-for-part.patch ===
Applied patch to 'doc/src/sgml/ref/create_publication.sgml' with conflicts.
U doc/src/sgml/ref/create_publication.sgml
diff --cc doc/src/sgml/ref/create_publication.sgml
index 427366e10b4,24f4110c6fb..00000000000
--- a/doc/src/sgml/ref/create_publication.sgml
+++ b/doc/src/sgml/ref/create_publication.sgml
@@@ -120,9 -120,8 +120,14 @@@ CREATE PUBLICATION <replaceable class="
        <replaceable class="parameter">table_name</replaceable> to
        explicitly indicate that descendant tables are included.
        For a partitioned table, <literal>ONLY</literal> and <literal>*</literal>
++<<<<<<< ours
 +      have no effect.  The partitions of a partitioned table are always
 +      implicitly considered part of the publication, so they do not need to be
 +      added explicitly.
++=======
+       have no effect: its partitions are always implicitly considered part of
+       the publication, so they do not need to be added explicitly.
++>>>>>>> theirs
       </para>
  
       <para>