[PATCH] Fix two incorrect code comments
1 patchset tracked - current t248573_1
v1t248573_1posted Jun 18, 02:53successwon't retrystale 2mopg 19
baseab3023ad1 Jun 17, 03:43 - 67 days / 663 commits behind master (from history)
applyapplied Jul 29, 00:09
rebaselast tried Jul 29, 00:09 on dd50eb914
Applying: Fix two incorrect code comments Using index info to reconstruct a base tree... M contrib/pg_stash_advice/stashfuncs.c M src/backend/parser/parse_func.c Falling back to patching base and 3-way merge... Auto-merging src/backend/parser/parse_func.c CONFLICT (content): Merge conflict in src/backend/parser/parse_func.c Patch failed at 0001 Fix two incorrect code comments 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/backend/parser/parse_func.c
pushJul 29, 00:09 -> fa1186b85branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 1005 / 1005 | 2m 58s / 5m 19s | docker run ... :t248573 | Jul 29, 00:20 |
run 30410270062executed 1005 - ccache 145 hit / 6474 miss - head fa1186b85 - digest sha256:a3e90759421e1d... - run 30410270062 | ||||||