Conflict highlight for selected row #3951
Merged
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.
Problems / Motivations
Causes
RelationshipResolver.ConflictDescriptions
only returned descriptions of conflicts for the mod with fewer indirectly-depending mods, intended to choose the conflict closest to what the user selected, but when these values were equal, neither would appear.Changes
The red conflict color has had its green and blue channels roughly halved to make this work a bit better.
Fixes #3947.