I haven't had any issues with SyncThing so far, other than the initial setup faff! I haven't had to deal with any horrible merges, and as long as you take frequent snapshots you should be able to recover if the worst happens.