Caution

🚨 Action Required — Conflict detected

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

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

• src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs
  🔍 View file in dotnet/aspnetcore vs VMR

ℹ️ 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.26062.6 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 resolve the conflict locally

   darc vmr resolve-conflict --subscription b220167f-d2e6-45e1-aeb6-ced11265d408

   This should apply the build 297155 with sources from 1e1e2f7
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.