http://docs.syncthing.net/users/faq.html#what-if-there-is-a-conflict http://docs.syncthing.net/users/faq.html#what-if-there-is-a-... > When a file has been m

http://docs.syncthing.net/users/faq.html#what-if-there-is-a-conflict http://docs.syncthing.net/users/faq.html#what-if-there-is-a-... > When a file has been modified on two devices > simultaneously, one of the files will be renamed to > <filename>.sync- conflict-<date>-<time>.<ext>.