DOCS - Add missing EXCEPT parameter description to ALTER PUBLICATION
1 patchset tracked - current t139905_5
v5t139905_5posted Jun 10, 06:44successwon't retrystale 5mopg 19
baseda51d9154 Jun 08, 05:56 - 138 days / 1294 commits behind master (from history)
applyapplied Jul 29, 00:32
rebaselast tried Jul 29, 00:32 on dd50eb914
Applying: doc: add missing EXCEPT parameter entry in ALTER PUBLICATION Using index info to reconstruct a base tree... M doc/src/sgml/ref/alter_publication.sgml Falling back to patching base and 3-way merge... Auto-merging doc/src/sgml/ref/alter_publication.sgml CONFLICT (content): Merge conflict in doc/src/sgml/ref/alter_publication.sgml Patch failed at 0001 doc: add missing EXCEPT parameter entry in ALTER PUBLICATION error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: doc/src/sgml/ref/alter_publication.sgml
pushJul 29, 00:32 -> 0e21bc613branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 1005 / 1005 | 2m 53s / 5m 06s | docker run ... :t139905 | Jul 29, 00:44 |
run 30411460266executed 1005 - ccache 145 hit / 6474 miss - head 0e21bc613 - digest sha256:69d4b0ca06ca56... - run 30411460266 | ||||||