Repository navigation
fix: skip the conflict when closing the resource conflict modal - #3742
Merged
Merged
Conversation
tammi-23
reviewed
Oct 13, 2026
tammi-23
left a comment
Contributor
There was a problem hiding this comment.
I think we also fix this issue:
- A folder contains one.txt with content "SERVER".
- Upload a local one.txt (content "LOCAL"). The "File already exists" dialog opens.
- Leave the dialog open and drag another, unrelated file (e.g. other.txt) into the same folder.
Expected: only other.txt is uploaded; one.txt stays untouched until the dialog is answered.
Actual: one.txt is uploaded too and overwritten with "LOCAL", although the dialog is still asking.
Member
Author
|
@tammi-23 Could you please open a separate issue for this? We will address it in a follow-up PR to avoid merge conflicts with other open PRs. |
Closed
2 tasks done
tammi-23
self-requested a review
October 18, 2026 12:35
tammi-23
approved these changes
Oct 18, 2026
tammi-23
left a comment
Contributor
There was a problem hiding this comment.
👍 LGTM, opened a new Issue for the other issue.
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
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.
Description
Related Issue
How Has This Been Tested?
Types of changes