Uh oh!
There was an error while loading. Please reload this page.
Fix neutral cultures created with the underscore - #87411
Conversation
ghost
commented
Jun 12, 2023
Tagging subscribers to this area: @dotnet/area-system-globalization Issue Detailsnull
|
tarekgh
commented
Jun 12, 2023
/backport to release/7.0-staging |
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/5246272638 |
tarekgh
commented
Jun 12, 2023
/backport to release/6.0-staging |
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/5246292235 |
@tarekgh backporting to release/7.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix neutral cultures created with the underscore
Using index info to reconstruct a base tree...
M src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
M src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs
Auto-merging src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
CONFLICT (content): Merge conflict in src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix neutral cultures created with the underscore
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
@tarekgh an error occurred while backporting to release/7.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
This is a delta change to the original fix#86441
#87394