Skip to content

[Backmerge] Merge conflicts between release/13.2 and main #14636

Description

@github-actions

Backmerge Conflict

The automated backmerge from release/13.2 to main failed due to merge conflicts.

What to do

  1. Checkout main and attempt the merge locally:
    git checkout main
    git pull origin main
    git merge origin/release/13.2
  2. Resolve the conflicts
  3. 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.

Metadata

Metadata

Type

No type

Fields

No fields configured for issues without a type.

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions