[PATCH]Feature improvement for MERGE tab completion
1 patchset tracked - current t46578_18
v18t46578_18posted Jan 10, 2023successwon't retryancient 4ypg 16
base9a6915257 Sep 22, 2022 - 1459 days / 10838 commits behind master (from history)
applyapplied Aug 18, 15:25
rebaselast tried Aug 18, 15:25 on 195e8e427
Applying: psql: Add PartialMatches() macro for better tab-completion. Using index info to reconstruct a base tree... A src/bin/psql/tab-complete.c Falling back to patching base and 3-way merge... Auto-merging src/bin/psql/tab-complete.in.c CONFLICT (content): Merge conflict in src/bin/psql/tab-complete.in.c Patch failed at 0001 psql: Add PartialMatches() macro for better tab-completion. 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: src/bin/psql/tab-complete.in.c
pushAug 18, 15:26 -> 516124181branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 16 | 663 / 663 | 2m 13s / 3m 58s | docker run ... :t46578 | Aug 18, 15:38 |
run 32154428471executed 663 - ccache 93 hit / 4449 miss - head 516124181 - digest sha256:fcb8cfb63a269f... - run 32154428471 | ||||||