Is that automatic or do I need to set something?
The FAQ implies that it's automatic and after diving through the settings menus I can see anything specifically related to this (unless I missed something)
https://docs.syncthing.net/users/syncing.html#conflict-handling
Follow
@benx @rose it’s a bit more complicated! if you update keepass database on 2 different devices before they sync, you have two different DB’s now and need to merge them, keepass lets you do that. Syncthing’s conflict handling only makes sure that both versions get stored so you can merge them manually. Tbh it’s such an infrequent occurrence, had to do it only once in many years.
@rip_imho @rose
Dropbox worked the same, as mentioned in my other comment. I was just happy enough that the data wasn't lost.
I didn't realise that you can merge files using KeePass though, so that is handy to know.