Unresolved conflicts dialog redundant conflict entry de-duplication and better persistence for local changes#21871
Merged
Unresolved conflicts dialog redundant conflict entry de-duplication and better persistence for local changes#21871
Conversation
also made sure we don't dispatch rule changes from within the dialog to avoid having the component drop changes when unlocking rules. fixes https://linear.app/nexus-mods/issue/APP-145/unresolved-conflicts-popup-omits-mods-and-clears-unsaved-rules fixes #21861
Aragas
approved these changes
Mar 26, 2026
Contributor
|
💚 |
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
3 participants
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.
Also made sure we avoid messing up the component's local rules state when the Redux state updates.
fixes https://linear.app/nexus-mods/issue/APP-145/unresolved-conflicts-popup-omits-mods-and-clears-unsaved-rules
fixes #21861