ensure conflicts popup and banner are cleaned up if conflicts no longer exist #7209
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
shiftkey
added
the
ready-for-review
|
LGTM. Ran both |
niik
requested changes
Apr 4, 2019
outofambit
previously approved these changes
Apr 4, 2019
shiftkey
requested review from
outofambit and
niik
and removed request for
outofambit
outofambit
previously approved these changes
Apr 4, 2019
|
@niik no, i love it more! |
outofambit
approved these changes
Apr 5, 2019
soundfreak
approved these changes
Apr 5, 2019
5 tasks
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.
Overview
Closes #7046
Description
This PR adds a
AppStore.clearConflictsFlowVisuals()function to ensure any UI related to conflicts (both merge conflicts and rebase conflicts) goes away if the rebase/merge is aborted outside the app.It wasn't clear to me from the original report how deep to go with cleaning up state, but we can iterate on this based on further testing and feedback.
Release notes
Notes: no-notes