Skip to content

Code Quality: Refactor Copy and Move collision processing#18211

Merged
yair100 merged 1 commit intofiles-community:mainfrom
KrisVandermotten:copy-move-collisions
Mar 9, 2026
Merged

Code Quality: Refactor Copy and Move collision processing#18211
yair100 merged 1 commit intofiles-community:mainfrom
KrisVandermotten:copy-move-collisions

Conversation

@KrisVandermotten
Copy link
Contributor

Resolved / Related Issues

Steps used to test these changes

  1. Open Files
  2. Select a set of files or folders.
  3. Copy them into some other folder.
  4. Select a subset of those same files or folders.
  5. Copy them again into the same folder.
  6. Observe that you are asked to resolve the correct set of conflicts.
  7. Observe that your chosen conflict resolution methods are honored.
  8. Move some of the copied files or folders back into the source folder.
  9. Observe that you are asked to resolve the correct set of conflicts.
  10. Observe that your chosen conflict resolution methods are honored.
  11. Undo your changes.

@yair100 yair100 requested a review from hishitetsu March 8, 2026 20:47
@yair100 yair100 added the ready for review Pull requests that are ready for review label Mar 8, 2026
Copy link
Member

@hishitetsu hishitetsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like a good performance improvement, and I don't see any problems. LGTM

@yair100 yair100 added ready to merge Pull requests that are approved and ready to merge and removed ready for review Pull requests that are ready for review labels Mar 9, 2026
@yair100 yair100 merged commit f1590ef into files-community:main Mar 9, 2026
6 checks passed
@yair100 yair100 changed the title Code Quality:Refactor Copy and Move collision processing Code Quality: Refactor Copy and Move collision processing Mar 9, 2026
@yair100
Copy link
Member

yair100 commented Mar 9, 2026

@hishitetsu thank you for reviewing.

@KrisVandermotten KrisVandermotten deleted the copy-move-collisions branch March 9, 2026 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready to merge Pull requests that are approved and ready to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Code Quality: Copy and Move collision processing can be improved

3 participants