Skip to content

[PB-6531]: resolve same-name items within a move collision batch - #2159

Merged
terrerox merged 7 commits into
feat/name-collision-folder-merge-on-skipfrom
fix/name-collision-same-name-batch
Oct 7, 2026
Merged

terrerox merged 7 commits into
feat/name-collision-folder-merge-on-skipfrom
fix/name-collision-same-name-batch

Conversation

@terrerox

@terrerox terrerox commented Sep 20, 2026 •

Copy link
Copy Markdown
Contributor

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.

  • Keep both: same-name files are now renamed one after the other (report (1).pdf, report (2).pdf). Before, both got report (1).pdf.
  • Replace: the existing file is trashed once, the first file takes its place, and the others are kept with a numbered name.
  • One by one: "Replace" on the second file did nothing. Now it always restores the file, and "apply to all" is offered whenever more than one file is pending.
  • A file only leaves the trash view if its move actually worked.

Related Issues

Related Pull Requests

Checklist

  • Changes have been tested locally.
  • Unit tests have been written or updated as necessary.
  • The code adheres to the repository's coding standards.
  • Relevant documentation has been added or updated.
  • No new warnings or errors have been introduced.
  • SonarCloud issues have been reviewed and addressed.
  • QA Passed

Testing Process

@terrerox
terrerox added this pull request to stack #2151 September 20, 2026 22:44
@cloudflare-workers-and-pages

cloudflare-workers-and-pages Bot commented Sep 20, 2026 •

Copy link
Copy Markdown

Deploying drive-web with  Cloudflare Pages  Cloudflare Pages

Latest commit: 8b4af77
Status:⚡️  Build in progress...

View logs

CandelR
CandelR previously approved these changes Sep 22, 2026
@terrerox
terrerox force-pushed the fix/name-collision-same-name-batch branch from 49b9660 to b3e86e1 Compare September 28, 2026 00:52
@terrerox
terrerox force-pushed the feat/name-collision-folder-merge-on-skip branch from fbb014d to 969b12c Compare September 28, 2026 00:52
@terrerox
terrerox force-pushed the fix/name-collision-same-name-batch branch from b3e86e1 to 720b538 Compare September 30, 2026 02:25
@terrerox
terrerox force-pushed the feat/name-collision-folder-merge-on-skip branch from 270c9ae to d9912e7 Compare October 7, 2026 03:30
@terrerox
terrerox force-pushed the fix/name-collision-same-name-batch branch from 720b538 to 86dfb97 Compare October 7, 2026 03:30
@terrerox
terrerox force-pushed the fix/name-collision-same-name-batch branch from 86dfb97 to 846a9a6 Compare October 7, 2026 13:25
@terrerox
terrerox removed this pull request from stack #2151 October 7, 2026 13:28
@terrerox
terrerox merged commit c0be480 into feat/name-collision-folder-merge-on-skip Oct 7, 2026
1 of 3 checks passed
@terrerox
terrerox deleted the fix/name-collision-same-name-batch branch October 7, 2026 14:42
@sonarqubecloud

sonarqubecloud Bot commented Oct 7, 2026

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants