More advanced options for the Filesystem dialog #4519
Merged
Conversation
This file contains hidden or 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
yaira2
requested changes
Apr 8, 2021
yaira2
requested changes
Apr 9, 2021
yaira2
reviewed
Apr 9, 2021
yaira2
reviewed
Apr 9, 2021
This reverts commit 3cc010b.
yaira2
reviewed
Apr 16, 2021
yaira2
reviewed
Apr 16, 2021
yaira2
previously approved these changes
Apr 16, 2021
yaira2
added
ready to merge
yaira2
added
ready for review
yaira2
approved these changes
Apr 16, 2021
yaira2
added
ready to merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Resolved / Related Issues
Details of Changes
Adds more advanced dialog and options for resolving conflicts. Now user can select the option they want per file basis.
Also UI got some refresh too!
Validation
How did you test these changes?