FolderShare has been a great solution for my Windows PCs, and I've been using it for over a year. It's free and is now a Microsoft product.
After the initial setup (almost painless), the app sits in the system tray and you are never reminded of its existence. You simply have a folder that is synced over the internet -- it feels just like you have a WAN network share.
It also handles generic conflicts in a reasonable fashion, similar to SVN -- each revision of the file is saved with the originating device name appended to it (so if I modify todo.txt on my laptop while it is offline, and also modify it on my desktop, when the laptop goes online both machines will now have a "todo.txt.laptop" and "todo.txt.desktop" file).
Slashdot Mirror
FolderShare has been a great solution for my Windows PCs, and I've been using it for over a year. It's free and is now a Microsoft product. After the initial setup (almost painless), the app sits in the system tray and you are never reminded of its existence. You simply have a folder that is synced over the internet -- it feels just like you have a WAN network share. It also handles generic conflicts in a reasonable fashion, similar to SVN -- each revision of the file is saved with the originating device name appended to it (so if I modify todo.txt on my laptop while it is offline, and also modify it on my desktop, when the laptop goes online both machines will now have a "todo.txt.laptop" and "todo.txt.desktop" file).