tweak message when closing dirty and conflicting merge editor #155176
+17
−13
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
bpasero
approved these changes
Jul 14, 2022
There was a problem hiding this comment.
👍 better, also +1 for the change to always pass in the editor for confirm.
One thing I was wondering: if you show a merge editor for a file that has no merge markers (e.g. from the command line), should the dialog be further tweaked? I think "Discard Merge Changes" is a no-op in that case because no merge markers got removed for opening?
andreamah
pushed a commit
that referenced
this pull request
Jul 14, 2022
jrieken
added a commit
that referenced
this pull request
Jul 18, 2022
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.
fyi @bpasero this ensures the close handler is always called with
IEditorIdentifier[]re #152841