Closed mergify[bot] closed 1 week ago
Cherry-pick of 93aaf3f0608ffaa4471b57bcec00d31679ab44f9 has failed:
On branch mergify/bp/release/stable/5.2/pr-779
Your branch is up to date with 'origin/release/stable/5.2'.
You are currently cherry-picking commit 93aaf3f.
(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: src/Uno.Templates/content/unoapp/global.json
no changes added to commit (use "git add" and/or "git commit -a")
Cherry-pick of 161adfa32dedddaa2e971cab15c0088be827c2ab has failed:
On branch mergify/bp/release/stable/5.2/pr-779
Your branch is ahead of 'origin/release/stable/5.2' by 2 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 161adfa.
(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)
Changes to be committed:
modified: src/Uno.Templates/content/unoapp/.template.config/template.json
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/Uno.Templates/content/unoapp/global.json
Cherry-pick of 1ff2184c8e27defec6af170c1372285bb99fa613 has failed:
On branch mergify/bp/release/stable/5.2/pr-779
Your branch is ahead of 'origin/release/stable/5.2' by 4 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 1ff2184.
(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: build/.azure-pipelines.TemplateValidation.yml
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
This will prevent getting started issues when having .NET 9 installed.
This is an automatic backport of pull request #779 done by Mergify.