Upload of folder with same name shows error

[tbsbdr]

Steps to reproduce

1. Login to https://ocis.ocis-wopi.released.owncloud.works/
2. Create a new folder "Folder" on the ocis instance and on your local drive.
3. upload your local "Folder" folder
4. upload does not start, shows error "Folder "Folder" already exists."
   

Expected behaviour

System should offer me alternative options to upload the folder.
The appropriate dialogues are consistently shown in case of conflicting resources, eg. in context of:

• Drag'n drop upload
• upload via upload-button
• move-dialog
• copy-dialog
• trashbin-restore
• etc...

General rule

User gets asked what to do in case of conflicting resources, as there is no common pattern across different services/platforms (OneDrive, Google Drive, Box, Windows, Mac, etc. - all different).

Note This dialog concept is also meant to be applied to #1753

Dialogs

Behaviour

1. Replace will replace the existing file (and creates a new version implicitly).
2. Keep both will create a new resource with an appended number "(xx)" - counting up, if ex. (2) already exists.
3. Cancel will skip the current resource, if applicable shows the next conflict.
4. Merge will combine folders with the same name; if they contain conflicting files, user gets asked what to do (dialog for files shows up).
5. Do this for all XX conflicts will apply the selected option to all XX upcoming conflicts. Is only shown, if there are at least 2 conflicts.
6. generally applicable: The

Userflows

---

solves:
#3751
#5761
#5106
#6546

groundwork for
#1753

[tbsbdr]

added to initial post:

The appropriate dialogues are consistently shown in case of conflicting resources, eg. in context of:

Drag'n drop upload
upload via upload-button
move-dialog
copy-dialog
trashbin-restore
etc...

[kulmann]

We can't implement "merge" with reasonable effort or performance at the moment. Will be ignored for the initial implementation. Instead we're using our usual conflict resolve dialog with Skip (multiple files/folders) / Cancel (single file/folder), Overwrite and Keep both as options.

[tbsbdr]

👍 perfect

(I guess you mean Replace - not Overwrite)

[kulmann]

(I guess you mean Replace - not Overwrite)

yes 😅