-
Notifications
You must be signed in to change notification settings - Fork 9.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
avoid resolving conflicts using "Open in External Editor" flow if no editors found #6109
Conversation
@billygriffin @ampinsk @outofambit just going to call out what I'd like input on from a UX side as part of addressing this bug:
|
Recap of discussion with @shiftkey, @ampinsk, @tierninho, and me: From @shiftkey's screenshot in #6109 (comment), we'll add in buttons as normal next to each conflict.
|
One extra thing:
This is a platform-specific label too ( |
e0faa1c
to
4fb6017
Compare
LGTM! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💯
Overview
Closes #6060
Description
findEditorOrDefault
, makeApp
responsible for that, and returnnull
if no editors can be foundMergeConflictsDialog
to resolve the editor after mounting, and not show the button if the editor cannot be foundRelease notes
This is related to a new feature that hasn't yet made it to production
Notes: no-notes