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.
Description
I messed up the release 26.4 when I picked up the 26.4 release a few days ago. Here is what happened:
The release branch is already merged into trunk: #24911. But I did not see that PR, and created another one: #24915. What's worse is that I merged the trunk branch into the release branch to solve merge conflicts. That means we have commits that are not intended to be released in the release branch. Also, the Localizable.strings files used by the translation process are changed after that merge.
Here is the commit that merged the trunk branch into the release branch: 74afbd0. From the commit, you can see the trunk commit was 808aafc.
Using this command, we can see the merged changes are 808aafc e5076c9.
This PR reverts those two commits in the release branch.
I'll remember to remove these two revert commits when merging the release branch into trunk. Update: commits were removed in #24933
Testing instructions