Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

71.4% Coverage
0.0% Duplication

Works now for the case:

• Alice has folder "top" and file "test.txt" in the root of the file system
• Alice drags-and-drops another file called "test.txt" from her local system on top of folder "top"
• folder "top" now has that "test.txt" in it - good.

The next thing is more tricky (and probably was tricky already before this PR):

• Alice edits the local "test.txt"
• Alice drags-and-drops the changes "test.txt" from her local system on top of folder "top"
• Alice is shown a dialog titled "One file conflict" and asked "Which files do you want to keep?" - good
• But the dialog mentions folder "top" as the "already existing file" and shows a "text file" icon for the "new file", but there is no mention of "test.txt" - not so good, see screenshot:

• if Alice selects the new file and "Continue" then top/test.txt does get updated with the new data - good.
• if Alice selects the "already existing file" (the folder "top") and "Continue" then no changes happen - good.

So the real behavior is OK. It is just that the "One file conflict" dialog should mention top/test.txt as being the existing file.

Is there something that can easily be done about that?

Note: the "will have a number added to its name" thing works - if I select both "files" and "Continue" then I end up with both test.txt and test (2).txt inside folder top - good

Much thanks for the detailled testing! 👍

But the dialog mentions folder "top" as the "already existing file" and shows a "text file" icon for the "new file", but there is no mention of "test.txt" - not so good, see screenshot:

Yes, we also observed this. Unfortunately there is no quick fix for this, because the frontend would need to scan the folder content. Also what happens if you drag a folder into the folder? It would require quite some work and thought either way. Therefore, and because it's "only" an UI issue, we decided to leave this behavior as it is right now.

Therefore, and because it's "only" an UI issue, we decided to leave this behavior as it is right now.

That's fine with me. Sorting all that out is a separate issue. The changes here do not make that any different than it already is.

Confirmed in 10.9.0-beta1