View Single Post
Quote:
Originally Posted by Ken Case View Post
If you're curious about implementation details, the underlying problem in this situation was that the sync database thought the iPhone had already synced all its changes—which it had, up to that point—so it compacted the sync history. But the changes-in-progress on the iPhone were based on its older pre-sync state, so when those changes were saved they caused the database to become incompatible (because the sync database was missing the history it needed to understand how to merge them).
Ah, I see. So it is able to merge changes when done on both sides. Excellent news!