[DOCS] Stats views and functions not in order?

back to CI dashboard

1 patchset tracked - current t46334_26

v26t46334_26posted Jan 11, 2023successwon't retryancient 4ypg 16
basecd06ccd78 Jan 10, 2023 - 1349 days / 10153 commits behind master (from history)
applyapplied Aug 18, 15:24
rebaselast tried Aug 18, 15:24 on 195e8e427
Applying: Add "Statistics Views" section and refentry for each view.
Using index info to reconstruct a base tree...
M	doc/src/sgml/monitoring.sgml
Falling back to patching base and 3-way merge...
Auto-merging doc/src/sgml/monitoring.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/monitoring.sgml
Patch failed at 0001 Add "Statistics Views" section and refentry for each view.

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/monitoring.sgml
pushAug 18, 15:24 -> f4adbc85ebranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success116672 / 6722m 17s / 4m 21sdocker run ... :t46334Aug 18, 15:36
run 32154233192
executed 672 - ccache 772 hit / 3781 miss - head f4adbc85e - digest sha256:50abab565769cb... - run 32154233192