Conflicts, how are they handled?

Support
1

Hi, how does Syncthing handle conflicts? Maybe there’s documentation about this but I couldn’t find any.

What happens for example if two nodes are offline for a period of time and edits the same file and then connects to a central node for syncing?

1 Like
2

Currently, it seems that one of the conflicted files is lost. I’m not sure which one.

Conflict handling is discussed here: https://github.com/syncthing/syncthing/issues/220

1 Like
3

The newest version of the file wins.

1 Like
4

I also would like to see a solution to conflicted files. Both Dropbox and Wuala make a copy of the conflicted files adding a sufix for quick recognition. Do you plan to add something like that?

5

Also see this thread: https://pulse-forum.ind.ie/t/does-old-ever-clobber-new/1242

6

I would like to suggest an (optional) renaming feature if a conflict (e.g. file.jpg) is detected e.g. file (conflict-1).jpg, file (conflict-2).jpg - this way you never lose any files if have seen this in other multi-host sync programs and it works really well for daily use

7