Skip to content

Conversation

@dotnet-maestro
Copy link
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/runtime

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/runtime:d14121e68669a02d123e04039892b40e3449346c..https://github.com/dotnet/dotnet:darc-release/10.0.1xx-1b2997da-1758-49a0-95a9-c67378e1e3b9

@dotnet-maestro
Copy link
Contributor Author

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/runtime/tree/d14121e68669a02d123e04039892b40e3449346c.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

ℹ️ To resolve the conflict, 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 and run
    ⚠️ Temporarily please install and use the following darc version:
    # Linux / MacOS
    ./eng/common/darc-init.sh --darcversion 1.1.0-beta.25609.2
    # or on Windows
    .\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25609.2
  3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally
    darc vmr resolve-conflict --subscription 97d3bf62-2885-49c1-87fe-a1f23e25ce08
    This should apply the build 294261 with sources from d14121e
  4. 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
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 December 11, 2025 15:30
@mmitche mmitche enabled auto-merge (squash) December 11, 2025 15:36
@mmitche mmitche merged commit 0f3863a into release/10.0.1xx Dec 11, 2025
15 of 16 checks passed
@mmitche mmitche deleted the darc-release/10.0.1xx-1b2997da-1758-49a0-95a9-c67378e1e3b9 branch December 11, 2025 19:04
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.

2 participants