[calpaterson]

I use dropbox for multi-master syncing. Seems to work ok. Emacs even has some file locking stuff that seems to help prevent me from clobbering changes I've made on another machine

[akkartik]

You mean you're modifying files stored in Dropbox from your phone? What sort of editor setup do you use?

[calpaterson]

Sorry no - I mean between desktop machines.

There are a few different android apps for the phone (I think they are Dropbox based) though I don't use any.