[PB-6531]: merge folder uploads into the existing folder on skip - #2129

Open

terrerox wants to merge 3 commits into

test/name-collision-skip-e2efrom

feat/name-collision-folder-merge-on-skip

Commits on Sep 15, 2026

feat: merge folder uploads into the existing folder on skip
terrerox
committed
449198b
test: add e2e coverage for name collision resolutions
terrerox
committed
ae1d202
test: ensure collision dialog closes after resolving file upload
terrerox
committed
fbb014d