Repository navigation
Conversation
4 of 7 tasks
CandelR
previously approved these changes
Sep 22, 2026
terrerox
force-pushed
the
fix/name-collision-same-name-batch
branch
from
September 28, 2026 00:52
49b9660 to
b3e86e1
Compare
terrerox
force-pushed
the
feat/name-collision-folder-merge-on-skip
branch
from
September 28, 2026 00:52
fbb014d to
969b12c
Compare
terrerox
force-pushed
the
fix/name-collision-same-name-batch
branch
from
September 30, 2026 02:25
b3e86e1 to
720b538
Compare
terrerox
force-pushed
the
feat/name-collision-folder-merge-on-skip
branch
from
October 7, 2026 03:30
270c9ae to
d9912e7
Compare
terrerox
force-pushed
the
fix/name-collision-same-name-batch
branch
from
October 7, 2026 03:30
720b538 to
86dfb97
Compare
terrerox
force-pushed
the
fix/name-collision-same-name-batch
branch
from
October 7, 2026 13:25
86dfb97 to
846a9a6
Compare
terrerox
removed this pull request from stack #2151
October 7, 2026 13:28
…restore-e2e [PB-6531]: e2e coverage for same-name restore collisions
terrerox
merged commit Oct 7, 2026
c0be480
into
feat/name-collision-folder-merge-on-skip
1 of 3 checks passed
|
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.



Description
Comes from the review comment on #2148: if you restore several files with the same name from the trash into a folder that already has that name, the collision dialog handled each file as if it were alone, and the second one failed.
report (1).pdf,report (2).pdf). Before, both gotreport (1).pdf.Related Issues
Related Pull Requests
Checklist
Testing Process