Skip to content

[main] Source code updates from dotnet/dotnet#5768

Open
dotnet-maestro[bot] wants to merge 1 commit intomainfrom
darc-main-89f9c653-5dcf-454b-b581-2c54fccc6c41
Open

[main] Source code updates from dotnet/dotnet#5768
dotnet-maestro[bot] wants to merge 1 commit intomainfrom
darc-main-89f9c653-5dcf-454b-b581-2c54fccc6c41

Conversation

@dotnet-maestro
Copy link
Contributor

Note

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

This pull request brings the following source code changes

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

Updated Dependencies

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:a6a5ddf95840f305b42bd43a8d30b062f9b67d1f..https://github.com/dotnet/diagnostics:darc-main-89f9c653-5dcf-454b-b581-2c54fccc6c41

@dotnet-maestro
Copy link
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 306701 of https://github.com/dotnet/dotnet/tree/a6a5ddf95840f305b42bd43a8d30b062f9b67d1f.

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/diagnostics
    cd diagnostics
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26167.2 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 7e2c91d5-dafe-449a-9d20-a3d5aa478584
    This should apply the build 306701 with sources from a6a5ddf
  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.

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