Updated tsaoptions.json to direct issues to runtime owners #108410
Conversation
|
Tagging subscribers to this area: @dotnet/area-meta |
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/11132636000 |
|
/backport to release/8.0-staging |
|
/backport to release/6.0-staging |
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/11132643000 |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/11132644522 |
|
@artl93 backporting to release/6.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Updated tsaoptions.json to direct issues properly.
Using index info to reconstruct a base tree...
A .config/tsaoptions.json
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): .config/tsaoptions.json deleted in HEAD and modified in Updated tsaoptions.json to direct issues properly.. Version Updated tsaoptions.json to direct issues properly. of .config/tsaoptions.json left in tree.
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 Updated tsaoptions.json to direct issues properly.
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@artl93 an error occurred while backporting to release/6.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Updated tsaoptions.json to direct issues to the runtime service tree.