Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2625567 #76649
Conversation
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
… Build ID 2614270
… Build ID 2614270
… Build ID 2614270
… Build ID 2614270
… Build ID 2614270
3 tasks
dotnet-bot
changed the title
dotnet-bot
changed the title
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
… Build ID 2625567
JoeRobich
approved these changes
Jan 22, 2025
Member
|
/backport main |
Member
|
/backport to main |
Contributor
|
Started backporting to main: https://github.com/dotnet/roslyn/actions/runs/13019753870 |
Contributor
|
@JoeRobich backporting to "main" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2614270
Applying: Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2614270
Applying: Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2614270
Applying: Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2614270
Applying: Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2614270
Applying: Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2625567
Applying: Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2625567
Applying: Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2625567
Using index info to reconstruct a base tree...
M src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf
M src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf
M src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf
M src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf
M src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf
M src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf
M src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf
Falling back to patching base and 3-way merge...
Auto-merging src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf
CONFLICT (content): Merge conflict in src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf
Auto-merging src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf
CONFLICT (content): Merge conflict in src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf
Auto-merging src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf
CONFLICT (content): Merge conflict in src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf
Auto-merging src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf
CONFLICT (content): Merge conflict in src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf
Auto-merging src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf
CONFLICT (content): Merge conflict in src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf
Auto-merging src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf
CONFLICT (content): Merge conflict in src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf
Auto-merging src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf
CONFLICT (content): Merge conflict in src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf
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 0008 Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2625567
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
This was referenced Jan 30, 2025
This was referenced Feb 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.