Revert "preferences: fix PreferenceProvider.merge method (#12126)"
#12213
Conversation
This file contains 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
This reverts commit b28c8b9.
paul-marechal
approved these changes
Feb 23, 2023
|
@AlexandraBuzila note that we plan on reintroducing your changes with #12174. Right now I'm mostly fighting with updating the launch preferences browser test suite as the change in merging logic understandably breaks most previous expectations regarding debug configuration resolution. |
This was referenced Mar 22, 2024
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.
What it does
The pull-request reverts the commit b28c8b9 which caused the bug #12153.
How to test
Review checklist
Reminder for reviewers