[h-e-w] Syncing Emacs org files

[Sarir Khamsi]

I've recently started down the spiritually enlightening path that is org
mode and noticed that I now have a bunch of org files on my laptop
(WinXP) and my desktop (Windows 7). There now seems to be a problem of
keeping these files synced up. Ediff is an option but that means knowing
what files have changed, and they are in a variety of dirs in my "home"
dir. rsync has been an option for directories, but with org files, it's
possible that the contents may need to be merged.

As you might guess, the laptop is not always connected to the same
network as the desktop, but eventually, they get hooked up, so using a
single file shared by both computer is not an option.

Ideally, I'd like a platform-neutral approach but I'd be OK with a
Windows-only solution. So my questions are:

1) What have people done in Emacs to sync up files in a somewhat
   automated fashion?

2) Is this best handled outside of Emacs with something like git (and
   mapping drives in Windows)?

Thanks.

Sarir

-- 
Sarir Khamsi
software guy
address@hidden