Skip to content

fix(upload): avoid skipping whole folder upload on conflict modal#5814

Merged
hacdias merged 1 commit intofilebrowser:masterfrom
SergioChan:fix-5798-skip-conflicts
Mar 11, 2026
Merged

fix(upload): avoid skipping whole folder upload on conflict modal#5814
hacdias merged 1 commit intofilebrowser:masterfrom
SergioChan:fix-5798-skip-conflicts

Conversation

@SergioChan
Copy link
Contributor

Description

  • fix conflict preflight for folder uploads so nested files are not all marked as conflicting when the top-level folder already exists
  • keep file-level conflict detection unchanged for non-folder uploads
  • this allows "Skip all conflicting files" to continue uploading non-conflicting files instead of aborting the transfer

Additional Information

Checklist

  • I am aware the project is currently in maintenance-only mode. See README
  • I am aware that translations MUST be made through Transifex and that this PR is NOT a translation update
  • I am making a PR against the master branch.
  • I am sure File Browser can be successfully built. See builds and development.

Fixes #5798

Testing

  • pnpm -C frontend install --config.engine-strict=false
  • pnpm -C frontend run typecheck

@SergioChan SergioChan requested a review from a team as a code owner March 7, 2026 10:29
@hacdias hacdias merged commit f5f8b60 into filebrowser:master Mar 11, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

If I choose "Skip conflicting files", the transfer does not start

2 participants