Rounding strategy
1 patchset tracked - current t76975_5
v5t76975_5posted Apr 23, 2021successwon't retryancient 5ypg 14
base609b0652a Apr 09, 2021 - 1990 days / 14194 commits behind master (from history)
applyapplied Aug 18, 15:57
rebaselast tried Aug 18, 15:57 on 195e8e427
Applying: Document tie breaking behavior of round() Using index info to reconstruct a base tree... A doc/src/sgml/func.sgml Falling back to patching base and 3-way merge... CONFLICT (modify/delete): doc/src/sgml/func.sgml deleted in HEAD and modified in Document tie breaking behavior of round(). Version Document tie breaking behavior of round() of doc/src/sgml/func.sgml left in tree. Patch failed at 0001 Document tie breaking behavior of round() 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/func.sgml
pushAug 18, 15:57 -> 941526970branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 14 | 621 / 621 | 2m 14s / 3m 13s | docker run ... :t76975 | Aug 18, 16:05 |
run 32157576141executed 621 - ccache 128 hit / 4247 miss - head 941526970 - digest sha256:57176b94a8165f... - run 32157576141 | ||||||