Merged
Conversation
wfurt
approved these changes
Nov 18, 2025
Member
|
Why are we changing it? It would be nice to have some link or background. |
Member
|
10.0 is only supported on 18.0.0. That may have been the motivating factor. |
mmitche
approved these changes
Nov 24, 2025
Member
|
@meghnave Does this need to go back to release/10.0? |
Member
|
I see failures in release/10.0 that are related to this, so yes |
Member
|
/backport to release/10.0 |
Contributor
|
Started backporting to |
Contributor
|
@akoeplinger backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update xcopy-msbuild to 18.0.0
Using index info to reconstruct a base tree...
M eng/common/sdk-task.ps1
M eng/common/tools.ps1
Falling back to patching base and 3-way merge...
Auto-merging eng/common/sdk-task.ps1
CONFLICT (content): Merge conflict in eng/common/sdk-task.ps1
Auto-merging eng/common/tools.ps1
CONFLICT (content): Merge conflict in eng/common/tools.ps1
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 Update xcopy-msbuild to 18.0.0
Error: The process '/usr/bin/git' failed with exit code 128 |
akoeplinger
added a commit
that referenced
this pull request
Dec 3, 2025
Member
|
Manual backport: #16367 |
1 task
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
4 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.
To double check: