Create a new sync store on both devices, then upload & synchronize both copies to this sync store. This should merge the changes and use the latest version of documents. As usual it’s highly recommended to back up both databases first, e.g. by duplicating/compressing them in the Finder.
↧
