Skip to content
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

Jump to bottom

Remove invalid characters in conflicts dialog #9068

Merged
merged 1 commit into from May 2, 2022
Merged

Remove invalid characters in conflicts dialog #9068

merged 1 commit into from May 2, 2022

Conversation

d2dyno1
Copy link
Member

@d2dyno1 d2dyno1 commented May 2, 2022

Resolved / Related Issues

Details of Changes

  • Manually renaming items in conflicts dialog will remove any invalid file name characters. This PR also fixes the issue where aggregate conflict resolve option was visible in file in use dialog

Validation
How did you test these changes?

  • Built and ran the app

@d2dyno1 d2dyno1 requested a review from yaira2 May 2, 2022 14:36
yaira2
yaira2 approved these changes May 2, 2022
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 merged commit 9736202 into files-community:main May 2, 2022
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
approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove invalid characters when renaming an item in the conflicts dialog
2 participants
@d2dyno1 @yaira2