Repository navigation
fix(files): resolve drop conflicts in folders with other files - #66862
Open
pringelmann wants to merge 1 commit into
Open
pringelmann wants to merge 1 commit into
pringelmann wants to merge 1 commit into
Conversation
Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
pringelmann
marked this pull request as ready for review
November 20, 2026 13:48
pringelmann
requested review from
kristian-zendato and
susnux
and removed request for
a team
November 20, 2026 13:48
This branch has not been deployed
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.
Summary
Regression from #61291: dropping a local file onto a folder with a same-named file shows no conflict dialog if the folder has other files too, and the upload is silently dropped. When the dialog does show, "Keep both" overwrites the existing file.
The
@nextcloud/dialogspicker expects only the conflicting nodes and leaves renaming to the caller.resolveConflictnow does both.How to test
Dialog missing:
a.txtandb.txta.txtonto it"Keep both" overwrites:
a.txta.txtonto it, pick "Keep both"a.txtis overwritten. After:a.txtanda (1).txtChecklist
3. to review, feature component)stable32)AI (if applicable)