[meson] add missing pg_attribute_aligned for MSVC in meson build
1 patchset tracked - current t46781_3
v3t46781_3posted Oct 15, 2022successwon't retryancient 4ypg 16
base0fe954c28 Oct 07, 2022 - 1444 days / 10706 commits behind master (from history)
applyapplied Aug 18, 15:30
rebaselast tried Aug 18, 15:30 on 195e8e427
Applying: meson: catch up to a few configure changes Using index info to reconstruct a base tree... M meson.build Falling back to patching base and 3-way merge... Auto-merging meson.build CONFLICT (content): Merge conflict in meson.build Patch failed at 0001 meson: catch up to a few configure changes 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: meson.build
pushAug 18, 15:31 -> 808b614f4branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 16 | 664 / 664 | 2m 53s / 4m 17s | docker run ... :t46781 | Aug 18, 15:41 |
run 32154928313executed 664 - ccache 213 hit / 4332 miss - head 808b614f4 - digest sha256:a4fc2538474bda... - run 32154928313 | ||||||