Skip to content

[dkurepa/submodules] Source code updates from maestro-auth-test/dotnet - #6

Open
maestro-local-dev[bot] wants to merge 1 commit into
dkurepa/submodulesfrom
darc-dkurepa/submodules-efa93c1a-ef35-46a2-9a40-25785239030e
Open

[dkurepa/submodules] Source code updates from maestro-auth-test/dotnet#6
maestro-local-dev[bot] wants to merge 1 commit into
dkurepa/submodulesfrom
darc-dkurepa/submodules-efa93c1a-ef35-46a2-9a40-25785239030e

Conversation

@maestro-local-dev

Copy link
Copy Markdown

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/maestro-auth-test/dotnet

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/maestro-auth-test/dotnet:f3adc1f1352c703a731f52fccfaecc940598e2b5..https://github.com/maestro-auth-test/source-build-assets:darc-dkurepa/submodules-efa93c1a-ef35-46a2-9a40-25785239030e

@maestro-local-dev

Copy link
Copy Markdown
Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 78 of https://github.com/maestro-auth-test/dotnet/tree/f3adc1f1352c703a731f52fccfaecc940598e2b5.

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/maestro-auth-test/source-build-assets
    cd source-build-assets
  2. Make sure your darc is up-to-date
    (version 0.0.99-dev 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 95117217-c658-4c48-8822-6e7e7db384f1 

    This should apply the build 78 with sources from f3adc1f

  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.

@maestro-local-dev

Copy link
Copy Markdown
Author

Important

⚠️ No subscription flowing code in the opposite direction is set up.
Code changes made in this repository will not flow back to the VMR on branch "dkurepa/submodules".

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

@maestro-local-dev

Copy link
Copy Markdown
Author

Note

VMR PRs included in this codeflow update:

💡 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