[Arkanosis]

Not a perfect solution for everyone as you need a computer to be always on (eg. a server, a NAS, whatever) for sync, but I've been using Orgzly on Android with Syncthing to handle the sync between all my computers and my phone, and it's much better that everything I've tried before.

[kqr]

That's my setup too and it has worked so well that I sometimes feel like I have to double check that it's still working because it runs so smoothly.

Occasionally I have to consolidate multiple edits with ediff-files, but that's normally only after I have accidentally disabled wifi on the phone for longer periods of time.