DOCS - Server Applications [option] should be [option...]
1 patchset tracked - current t53327_1
v1t53327_1posted Feb 17, 01:08successwon't retrystale 52dpg 20
basea84eca662 Jul 29, 16:52 on master
applyapplied Jul 29, 17:10
rebaselast tried Aug 28, 01:48 on 6e5d5680b
Applying: DOCS - option should be first and have ellipsis Using index info to reconstruct a base tree... M doc/src/sgml/ref/pg_controldata.sgml M doc/src/sgml/ref/pg_resetwal.sgml M doc/src/sgml/ref/pgupgrade.sgml Falling back to patching base and 3-way merge... Auto-merging doc/src/sgml/ref/pgupgrade.sgml Auto-merging doc/src/sgml/ref/pg_resetwal.sgml CONFLICT (content): Merge conflict in doc/src/sgml/ref/pg_resetwal.sgml Auto-merging doc/src/sgml/ref/pg_controldata.sgml CONFLICT (content): Merge conflict in doc/src/sgml/ref/pg_controldata.sgml Patch failed at 0001 DOCS - option should be first and have ellipsis 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/pg_resetwal.sgml, doc/src/sgml/ref/pg_controldata.sgml
pushJul 29, 17:10 -> 88a2b70b1branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1016 / 1016 | 2m 50s / 5m 25s | docker run ... :t53327 | Jul 29, 17:21 |
run 30474095343executed 1016 - ccache 166 hit / 6452 miss - head 88a2b70b1 - digest sha256:33377359c88bba... - run 30474095343 | ||||||
| success | 1 | 20 | 1014 / 1014 | 2m 52s / 4m 52s | docker run ... @sha256:f6011e0... | Jul 28, 17:20 |
run 30381555984executed 1014 - ccache 166 hit / 6452 miss - head 08baa231c - digest sha256:f6011e03f4e38c... - run 30381555984 | ||||||
| success | 1 | 20 | 1013 / 1013 | 2m 47s / 5m 18s | docker run ... @sha256:781a095... | Jul 27, 03:59 |
run 30235485029executed 1013 - ccache 166 hit / 6452 miss - head 368bba31a - digest sha256:781a09573cbd26... - run 30235485029 | ||||||