[Intel-gfx] ✗ Fi.CI.BAT: failure for build: make meson more official

[Patchwork]

== Series Details ==

Series: build: make meson more official
URL   : https://patchwork.freedesktop.org/series/36320/
State : failure

== Summary ==

Applying: build: make meson more official
Using index info to reconstruct a base tree...
M	CONTRIBUTING
M	NEWS
M	README
M	meson.sh
Falling back to patching base and 3-way merge...
Auto-merging README
CONFLICT (content): Merge conflict in README
Auto-merging CONTRIBUTING
CONFLICT (content): Merge conflict in CONTRIBUTING
Patch failed at 0001 build: make meson more official
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".