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

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

terrerox merged 11 commits into

test/name-collision-skip-e2einternxt/drive-web:test/name-collision-skip-e2efrom

feat/name-collision-folder-merge-on-skipinternxt/drive-web:feat/name-collision-folder-merge-on-skipCopy head branch name to clipboard