Currently I sponsor the project and use the built in sync but it is a bit rough around the edges still and I have seen a solution for automatic conflict resolution using syncthing.

Do you use a script or something or are you just careful?