Shows "Accept Combination (Incoming first)" when combination is order-sensitive. #173035
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
Tyriar
previously approved these changes
Feb 1, 2023
hediet
commented
Feb 1, 2023
src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
Outdated
Show resolved
Hide resolved
Tyriar
approved these changes
Feb 1, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
In some situations, "Accept Combination" can put Incoming or Current first (e.g. when both append a parameter to the same signature).
I think it is helpful to indicate that clicking "Accept Combination" in the left editor puts Incoming first, while clicking "Accept Combination" in the right editor puts Current first in such cases.
Personally, it makes it easier to decide which side to take when I know the combination is not order-sensitive (which is the common case).
In cases where the order does not matter, only "Accept Combination" should be shown.
The addition
Accept Combination (Incoming first)looks a bit ugly at first, but since it is not the common case I would favor clarity over looks here. When(Incoming first)or(Current first)is missing, the user can learn that the order does not matter in such cases.