Microsoft.IO.Redist 6.0.1 #10375
Microsoft.IO.Redist 6.0.1 #10375
Conversation
VS would like to consume this updated version and we need to coordinate.
|
/backport to vs17.11 |
|
Started backporting to vs17.11: https://github.com/dotnet/msbuild/actions/runs/11048054647 |
|
@GangWang01 an error occurred while backporting to vs17.11, please check the run log for details! Error: @GangWang01 is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your dotnet team membership visibility is set to Public on https://github.com/orgs/dotnet/people?query=GangWang01 |
|
/backport to vs17.11 |
|
Started backporting to vs17.11: https://github.com/dotnet/msbuild/actions/runs/11048102158 |
|
@GangWang01 backporting to vs17.11 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Microsoft.IO.Redist 6.0.1
Using index info to reconstruct a base tree...
M eng/Versions.props
M src/MSBuild/app.amd64.config
M src/MSBuild/app.config
Falling back to patching base and 3-way merge...
Auto-merging src/MSBuild/app.config
CONFLICT (content): Merge conflict in src/MSBuild/app.config
Auto-merging src/MSBuild/app.amd64.config
CONFLICT (content): Merge conflict in src/MSBuild/app.amd64.config
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
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 advice.mergeConflict false"
Patch failed at 0001 Microsoft.IO.Redist 6.0.1
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@GangWang01 an error occurred while backporting to vs17.11, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
4 participants
VS would like to consume this updated version and we need to coordinate.