Backmerge Conflict
The automated backmerge from release/13.2 to main failed due to merge conflicts.
What to do
- Checkout main and attempt the merge locally:
git checkout main
git pull origin main
git merge origin/release/13.2
- Resolve the conflicts
- Push the merge commit or create a PR manually
Details
Workflow run: https://github.com/dotnet/aspire/actions/runs/22331129797
Commits to merge: 13
This issue was created automatically by the backmerge-release workflow.
Backmerge Conflict
The automated backmerge from
release/13.2tomainfailed due to merge conflicts.What to do
Details
Workflow run: https://github.com/dotnet/aspire/actions/runs/22331129797
Commits to merge: 13
This issue was created automatically by the backmerge-release workflow.