From edd5dee34243d7a4387f973e6def4007306c7c84 Mon Sep 17 00:00:00 2001 From: Luka Trovic Date: Fri, 29 Aug 2025 13:52:23 +0200 Subject: [PATCH] fix: resolving conflict when uploading multiple files via drag&drop Signed-off-by: Luka Trovic --- apps/files/src/services/DropServiceUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/src/services/DropServiceUtils.ts b/apps/files/src/services/DropServiceUtils.ts index f10a09cfe27..bf6d93dae06 100644 --- a/apps/files/src/services/DropServiceUtils.ts +++ b/apps/files/src/services/DropServiceUtils.ts @@ -158,7 +158,7 @@ export const resolveConflict = async (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')