Ask HN: How do you keep your work and home machine in sync?

I primarily use a Macbook Pro for work and carry it everyday from home to my office. I'm tired of doing so, and hence I'm planning to get a mac mini for office.

I have a difficult time deciding how to keep my files in sync. I could use dropbox or Google drive but syncing every little change becomes operationally difficult. Also, when I'm traveling and working offline, I might not have access to files on the other machine.

What solution do you use to address these issue?