Closed mergify[bot] closed 3 months ago
Cherry-pick of abaffbc7c0246d02cf4ce1286ff03aabc0ff1b0d has failed:
On branch mergify/bp/0.28.x/pr-2983
Your branch is up to date with 'origin/0.28.x'.
You are currently cherry-picking commit abaffbc7c.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: samples/CMakeLists.txt
both modified: src/CMakeLists.txt
no changes added to commit (use "git add" and/or "git commit -a")
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
See https://github.com/msys2/MINGW-packages/issues/21028
No idea about the MSVC + Conan stuff though - looks like GitHub removed a whole bunch of MSVC toolchains from their runners recently?
This is an automatic backport of pull request #2983 done by Mergify.