Skip to content

fix: resolving conflict when uploading multiple files via drag&drop #54738

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

Merged
provokateurin merged 2 commits into from
Sep 1, 2025
Merged

fix: resolving conflict when uploading multiple files via drag&drop #54738

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edd5dee
fix: resolving conflict when uploading multiple files via drag&drop
luka-nextcloud Aug 29, 2025
7d8735f
chore(assets): Recompile assets
nextcloud-command Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: resolving conflict when uploading multiple files via drag&drop 
Signed-off-by: Luka Trovic <[email protected]>
  • Loading branch information
@luka-nextcloud
luka-nextcloud committed Aug 31, 2025
commit edd5dee34243d7a4387f973e6def4007306c7c84
2 changes: 1 addition & 1 deletion apps/files/src/services/DropServiceUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export const resolveConflict = async <T extends ((Directory|File)|Node)>(files:
logger.debug('Conflict resolution', { uploads, selected, renamed })

// If the user selected nothing, we cancel the upload
if (selected.length === 0 && renamed.length === 0) {
if (selected.length === 0 && renamed.length === 0 && uploads.length === 0) {
// User skipped
showInfo(t('files', 'Conflicts resolution skipped'))
logger.info('User skipped the conflict resolution')
Expand Down
Loading