Skip to content

[main] Source code updates from dotnet/aspnetcore#6274

Open
dotnet-maestro[bot] wants to merge 1 commit intomainfrom
darc-main-28bad717-c099-443e-9c31-640582888ce1
Open

[main] Source code updates from dotnet/aspnetcore#6274
dotnet-maestro[bot] wants to merge 1 commit intomainfrom
darc-main-28bad717-c099-443e-9c31-640582888ce1

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

Note

This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/aspnetcore

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/aspnetcore:555c870701840795703abf6589d7c17f69751643..https://github.com/dotnet/dotnet:darc-main-28bad717-c099-443e-9c31-640582888ce1

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 311824 of https://github.com/dotnet/aspnetcore/tree/555c870701840795703abf6589d7c17f69751643.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26222.1 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription b220167f-d2e6-45e1-aeb6-ced11265d408
    This should apply the build 311824 with sources from 555c870
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-policy-service dotnet-policy-service Bot requested a review from a team April 25, 2026 13:39
@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id b220167f-d2e6-45e1-aeb6-ced11265d408
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id b220167f-d2e6-45e1-aeb6-ced11265d408 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants