| || |
File syncing with conflict detection
I need to set up file syncing (several directories) between three devices - a Nook Color running CyanogenMod7, a Droid X (which will be rooted soon), and my Windows PC.
I'll be updating some of the files on all three devices, so I'd like to have conflict detection. (A conflict occurs when file X has been updated on device 1, and also has been updated on device 2, so the odds are that neither device has all the updates.)
I also would prefer NOT to have my files (unencrypted) up on someone else's server.
I don't care one way or the other about contact syncing, email syncing, etc. Just files.
For connection I can do wifi or USB. I have an SMB server on the Nook, and intend to put it on the DroidX once I have that rooted.
Does anyone have suggestions on how to do this?
Note: the files involved are NOT application development. I don't need a full version-control system (actually I already have one, but there's no Android client; plus my Windows backup software does versioning) and I don't want to have to explicitly check things in.