[e2e-tests] upload folder with different options#2483
Merged
Conversation
saw-jan
approved these changes
May 11, 2026
ScharfViktor
force-pushed
the
upload-folder-with-keep-both
branch
2 times, most recently
from
dc5f306 to
c83e7ce
Compare
ScharfViktor
force-pushed
the
upload-folder-with-keep-both
branch
from
c83e7ce to
daf5347
Compare
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
2 participants
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.
Added e2e test coverage for folder upload conflict handling:
Keep both — uploaded folder is renamed with an index suffix (e.g.
PARENT (1)), original is preserved with its contents intactMerge — uploaded folder is merged into the existing one; existing files are replaced, unique files are kept
found bug message is confusing when uploading a folder with the merge option #2484