How do I sync two diverged vaults?
I have 1Password for Windows installed on two PCs, one at home and one at work. They were setup and syncing over Dropbox. I didn't notice when my company started blocking Dropbox network traffic. So, my vaults have diverged. That is, I have additions and edits to different records in both vaults on both PCs, neither synced to each other. I can't get Dropbox unblocked. So I plan on taking my work PC home once in a while to sync.
But, I'm not clear on the sync implementation... will one vault "win" and overwrite all of the edits in the other vault? Or is the implementation more of a transaction log and the edits should merge together?
1Password Version: 4.6.0.585
Extension Version: Not Provided
OS Version: Windows 7 Pro SP1 64-bit
Sync Type: Dropbox
Referrer: kb-search:dropbox sync, kb:sync-options
Comments
-
@AnthonyMastrean - The 1Password data on the two Windows PCs will merge correctly when they both have access to Dropbox.
0
