Return to Revisions

I can't help but to think that if you have a user that isn't connected on a device, then he updates his information on another device that is connected, then comes back to the first device, the first thing that's gonna happen is, that first device is gonna want to sync with the server. At that point, the disconnected app has to take what the server says or give the user the option to overwrite. My question would be, "how is the user coming to connect device B without connecting device A first?" Look at the way source control works... if you make changes at work, forget to sync, make changes at home and sync, when you come back to work, you're gonna have sync conflicts you have to resolve. Syncing multiple devices with a central database works the same way. I guess in order to get a more detailed answer you'd have to provide more specifics about the situation at hand. Depending on the circumstance, you could write in "merge logic," but that could get quite messy...