i need to sync my main work TODO org file between my work PC and laptop i carry around on work related trips and when im at home. i have tried several methods buy really none of them work.

i mainly used git over the last 6 months but that forces me to pull/commit/push manually each time i add something to either machine and that is really annoying. plus i get merge conflicts all the time

I have tried dropbox at the past but again this causes conflicts, isnt reliable to me (on my linux laptop it doesn't always resume sync after sleep)

I am using linux (arch linux on laptop  and debian on work PC to be precise)

Also i use mobileorg on phones/tablets which works with various levels of success :)

any advice would be hugely appreciated!

thanks alot

Z