[release/8.0.1xx] Remove 6.0 template #20163
Conversation
|
/backport to release/8.0.3xx |
|
Started backporting to release/8.0.3xx: https://github.com/dotnet/installer/actions/runs/11230080220 |
|
@v-wuzhai backporting to release/8.0.3xx failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: [release/8.0.1xx] Remove 6.0 template
Using index info to reconstruct a base tree...
M eng/Versions.props
Falling back to patching base and 3-way merge...
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 [release/8.0.1xx] Remove 6.0 template
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@v-wuzhai an error occurred while backporting to release/8.0.3xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
/backport to release/8.0.4xx |
|
Started backporting to release/8.0.4xx: https://github.com/dotnet/installer/actions/runs/11230084964 |
|
@v-wuzhai backporting to release/8.0.4xx failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: [release/8.0.1xx] Remove 6.0 template
Using index info to reconstruct a base tree...
M eng/Versions.props
Falling back to patching base and 3-way merge...
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 [release/8.0.1xx] Remove 6.0 template
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@v-wuzhai an error occurred while backporting to release/8.0.4xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
No description provided.