Directory collisions (or hopefully not)

[sil (Stuart Langridge)]

Will syncthing conflict when syncing to directories that already exist, or will it only conflict on files?

An example. Imagine I have a directory:

stuff/
    file1.txt
    file2.txt
    subdir/
        subfile1.txt

and I want to sync the content of stuff/ into another directory on another server

destination/
    already-existing.txt
    file2.txt (different to the one above)
    subdir/
        someotherfile.txt

I would expect the result to be:

destination
    file1.txt
    already-existing.txt
    file2.txt
    file2.txt.sync-conflict
    subdir/
        someotherfile.txt
        subfile1.txt

that is, that the two different file2.txts with the same path but different contents will conflict (that’s good) but that the two subdirs won’t conflict (because they’re just directories). Am I correct? (Assume that the two subdirs don’t differ in any weird way such as permissions or anything.)

[calmh (Jakob Borg)]

Files only. Well, theoretically it will also conflict on directories that differ in permissions, but it’ll just choose one of them and continue.