Migrate VMR pipeline and orchestration fixes from 10.0.2xx#2749
Merged
Conversation
jkoritzinsky
approved these changes
Oct 7, 2025
Member
Author
|
/backport to main |
Contributor
Contributor
|
@mthalman backporting to "main" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Migrate VMR pipeline and orchestration fixes from 10.0.2xx
.git/rebase-apply/patch:272: trailing whitespace.
DestinationFolder="$(ExtraTestDependenciesRestoreSourcePath)"
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M eng/VmrLayout.props
M eng/pipelines/official.yml
M eng/pipelines/pr.yml
M eng/pipelines/templates/jobs/vmr-build.yml
M repo-projects/Directory.Build.targets
Falling back to patching base and 3-way merge...
Auto-merging eng/VmrLayout.props
Auto-merging eng/pipelines/official.yml
Auto-merging eng/pipelines/pr.yml
CONFLICT (content): Merge conflict in eng/pipelines/pr.yml
Auto-merging eng/pipelines/templates/jobs/vmr-build.yml
Auto-merging repo-projects/Directory.Build.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Migrate VMR pipeline and orchestration fixes from 10.0.2xx
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
mthalman
added a commit
to mthalman/dotnet
that referenced
this pull request
Oct 7, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There were a number of VMR pipeline and orchestration fixes that were made in #2632. Migrating these back to 10.0.1xx.