Show conflicts in changeset #3727
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
HebaruSan
added
Enhancement
HebaruSan
force-pushed
the
feature/apply-disabled-tooltip
branch
from
a5fe268
to
5d335bb
Compare
|
I have a suggestion: if there are conflicts, clicking the apply button will bring a popup describing the conflicts that are present and why changes cannot be applied. |
This comment was marked as outdated.
This comment was marked as outdated.
HebaruSan
force-pushed
the
feature/apply-disabled-tooltip
branch
from
5d335bb
to
2fc0dbb
Compare
This comment was marked as resolved.
This comment was marked as resolved.
HebaruSan
changed the title
techman83
approved these changes
Mar 1, 2023
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.
Background
When a user tries to install mods that conflict with one another or with an installed mod, the apply changes button is disabled and a description of the conflict appears in the leftward part of the status bar.
Motivation
It has been fairly common recently for users to ask why the apply changes button is disabled; many or most users don't notice the text in the lower left until it's pointed out.
Changes
Now when the changeset has conflicts, you can still click the apply changes button, but the conflicting mods are highlighted in red in the changeset, the conflict reasons take over the description column, and the apply button is disabled:
Hopefully this will make it more discoverable.