[7.0.3 Cherry-pick] [Scheduled Run] Localized resource files from OneLocBuild - #4649
Draft
github-actions[bot] wants to merge 2 commits into
Draft
[7.0.3 Cherry-pick] [Scheduled Run] Localized resource files from OneLocBuild#4649github-actions[bot] wants to merge 2 commits into
github-actions[bot] wants to merge 2 commits into
Conversation
To resolve, run: git cherry-pick 92eb8b4
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Member
|
Closing as not applicable to release/7.0. The localization commit replaces two resource keys with ADP_InvalidMixedUsageOfAccessTokenProperties, but release/7.0 still uses the two original keys and its localized files contain neither entry. Resolving with the release versions produces no changes. |
Keep the release-specific resource keys because the consolidated key from main is not used on release/7.0. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
cheenamalhotra
changed the title
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Cherry-pick of #4645 (92eb8b4) into
release/7.0.\n\nThe conflicting main-only resource key is not used on release/7.0, so the release-specific localized keys are retained.