Skip to content

[release/dev18.0] Source code updates from dotnet/dotnet - #13207

Open
dotnet-maestro[bot] wants to merge 1 commit into
release/dev18.0from
darc-release/dev18.0-4c08feb1-3a57-4ad6-b233-267f36d754c0
Open

[release/dev18.0] Source code updates from dotnet/dotnet#13207
dotnet-maestro[bot] wants to merge 1 commit into
release/dev18.0from
darc-release/dev18.0-4c08feb1-3a57-4ad6-b233-267f36d754c0

Conversation

@dotnet-maestro

Copy link
Copy Markdown

@dotnet-maestro

Copy link
Copy Markdown
Author

Caution

🚨 Action Required — Conflict detected

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

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/razor
    cd razor
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26374.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 e4824c68-d3f4-40f7-b846-074c663b8bbd 

    This should apply the build 324500 with sources from e0c9b3f

  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
Author

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