Skip to content

Feature: Remember previously selected option in conflicts dialog #11399

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Feb 21, 2023
Merged

Feature: Remember previously selected option in conflicts dialog #11399

merged 4 commits into from
Feb 21, 2023

Conversation

hishitetsu
Copy link
Member

Resolved / Related Issues
Items resolved / related issues by this PR.

Details

  • When the Apply to All option is other than Custom and the Continue button is pressed, the option that was selected is saved.
  • Fixed a bug that caused the Apply to All option to be applied to non-conflicted files.
  • The flyout-related code did not appear to be used, so it was removed.

Validation
How did you test these changes?

  • Built and ran the app
  • Tested the changes for accessibility

yaira2
yaira2 reviewed Feb 21, 2023
View reviewed changes
yaira2
yaira2 reviewed Feb 21, 2023
View reviewed changes
yaira2
yaira2 approved these changes Feb 21, 2023
View reviewed changes
Copy link
Member

@yaira2 yaira2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yaira2 yaira2 added the ready to merge Pull requests that are approved and ready to merge label Feb 21, 2023
@yaira2 yaira2 merged commit 403039b into files-community:main Feb 21, 2023
@hishitetsu hishitetsu deleted the SaveConflictResolveOption branch February 22, 2023 02:08
@hishitetsu hishitetsu mentioned this pull request Mar 5, 2023
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yaira2 yaira2 yaira2 approved these changes

Assignees
No one assigned
Labels
ready to merge Pull requests that are approved and ready to merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Feature: Remember previously selected option in conflicts dialog
2 participants
@hishitetsu @yaira2