=== Applying patches on top of PostgreSQL commit ID 42473b3b31238b15cc3c030b4416b2ee79508d8c ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Nov 26 22:39:20 UTC 2025
On branch cf/6062
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v8-0001-PG15.-Fix-synopsis.patch ===
Applying: PG15. Fix synopsis
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/alter_publication.sgml
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
Auto-merging doc/src/sgml/ref/alter_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 PG15. Fix synopsis
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/alter_publication.sgml
M	doc/src/sgml/ref/create_publication.sgml
=== using patch(1) to apply patch ./v8-0001-PG15.-Fix-synopsis.patch ===
patching file doc/src/sgml/ref/alter_publication.sgml
patching file doc/src/sgml/ref/create_publication.sgml
Hunk #1 FAILED at 28.
1 out of 1 hunk FAILED -- saving rejects to file doc/src/sgml/ref/create_publication.sgml.rej
Unstaged changes after reset:
M	doc/src/sgml/ref/alter_publication.sgml
Removing doc/src/sgml/ref/create_publication.sgml.rej
=== using 'git apply' to apply patch ./v8-0001-PG15.-Fix-synopsis.patch ===
Applied patch to 'doc/src/sgml/ref/alter_publication.sgml' cleanly.
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 66a70e5c5b5,787750b8664..00000000000
--- a/doc/src/sgml/ref/create_publication.sgml
+++ b/doc/src/sgml/ref/create_publication.sgml
@@@ -27,13 -28,12 +27,19 @@@ CREATE PUBLICATION <replaceable class="
  
  <phrase>where <replaceable class="parameter">publication_object</replaceable> is one of:</phrase>
  
-     TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) ] [ WHERE ( <replaceable class="parameter">expression</replaceable> ) ] [, ... ]
+     TABLE <replaceable class="parameter">table_and_columns</replaceable> [, ... ]
      TABLES IN SCHEMA { <replaceable class="parameter">schema_name</replaceable> | CURRENT_SCHEMA } [, ... ]
  
++<<<<<<< ours
 +<phrase>where <replaceable class="parameter">all_publication_object</replaceable> is one of:</phrase>
 +
 +    ALL TABLES
 +    ALL SEQUENCES
++=======
+ <phrase>and <replaceable class="parameter">table_and_columns</replaceable> is:</phrase>
+ 
+     [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) ] [ WHERE ( <replaceable class="parameter">expression</replaceable> ) ]
++>>>>>>> theirs
  </synopsis>
   </refsynopsisdiv>