Restore conflict highlights in changeset #3948
Merged
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
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.
Problem
As of #3727, conflicts are supposed to be highlighted red in the changeset, but that's not working right now if you click the Apply button. (Clicking the changeset tab instead still works.)
Cause
In #3890, the Apply button was refactored to re-use the
StartChangeSetevent (previously only used by the right click reinstall option) rather than theGUI.Main.Instanceglobal singleton. But that event didn't handle conflicts, so they were passed asnull, and the changeset tab never showed them.Changes
Now the conflicts are passed along.
Fixes #3946.
Definitely self-reviewing this one.