Adding iCloud Sync Replaces Instead of Merges
On MBP A, I have 194 items and for some reason, it stopped syncing with iCloud and asked to fix it.
On MBP B, it has been syncing but somehow I lost about 100 entries (separate problem).
The problem I have is on MBP A, I am setting up iCloud sync again. It says that it is going to merge what is in iCloud with my current vault, but what it REALLY is doing is replacing everything in my current vault.
How can I really merge this data? I have new items that are in iCloud that need to be merged into this current vault that has 194 items.
1Password Version: 5.3
Extension Version: Not Provided
OS Version: 10.10.4
Sync Type: iCloud
Comments
-
Hi @boogybren,
The message about merging can be a little confusing, but "merge" basically just means 1Password will compare your 1Password data on that Mac with the data stored in iCloud, and keep the newest copies of all the records so you have the same information in both places. Any data updated in iCloud should then be copied to the other Mac, and vice versa. Any items that match in both places are left alone, so you shouldn't get any duplicates. Nothing will be deleted unless you specifically delete it yourself.
Having said that, you mentioned that you lost around 100 items from 1Password on MBP B, so that might be a valid concern, depending on how that happened. For example, if you moved 100 items in your vault to the Trash in 1Password, and then emptied the Trash, those changes should sync to iCloud and the other Mac, meaning they would be deleted from both. So if that's what happened, obviously you won't want to risk losing those items from MBP A! It might help if you can give us a little more information about what happened to the items in 1Password on MBP B, so we understand the exact situation.
Now, you also said there are new items in iCloud that have not yet synced to MBP A (I assume they are from MBP B?), and you don't want to lose those items, but you're worried you'll lose data from MBP A if you choose to merge when re-enabling iCloud sync. Is that correct? If so, here's what I would suggest doing (read through these steps first to make sure they make sense to you, in case I misunderstood the situation):
- On both Macs, open 1Password and go to File > Backup (this will open the Backup preferences and show all the automatic backups, including the new one you just made).
- On MBP A, go to the Sync preferences in 1Password and re-enable iCloud sync.
- Choose to merge the data when prompted.
- After the sync completes, check the items in your vault on MBP A - do you have everything from both MBP A and MBP B, or are you missing anything?
If you have all your data in the vault at this point, you're all set, and that should all sync back to MBP B as well. On the other hand, if the newer items from iCloud now show up on MBP A but you're missing some items you previously had there, follow these steps:
- Open 1Password on MBP A and unlock with your master password if necessary.
- Select All Items, then sort the list of items by Date Created or Date Modified.
- Select all the newer items you need to keep which aren't already in the backup you made earlier (hold ⌘ on your keyboard and click each item you need to select).
- Go to File > Export > Selected Items, then enter your master password.
- Choose the Desktop, make sure 1Password Interchange Format (.1pif) is selected as the File Format, and click Save.
- Go to the menu for 1Password > Preferences, then select Backup.
- Restore from the most recent backup you made of the 194 items.
- After the restore, go to File > Import.
- Select the .1pif folder you created, then click Open.
If all goes well, your vault should now have all of your latest/current data. You'll need to re-enable iCloud sync at this point, and that should update iCloud with all the items from your vault, which should then also sync to MBP B. If you have any questions about that or if I misunderstood the problem you described, please do let us know. Otherwise, let us know how it all works out. Thanks!
0 -
Thank you for the prompt reply.
MBP B I think was the victim of syncing woes like I am discussing with now. Every once in a while, 1PW will tell me that there is a sync issue and take me to the sync preferences to fix it. iCloud usually shows disabled so I enable it. I never really paid attention to the item count until today so somehow down the line, I lost a good chunk of my items.
I will follow the export instructions and see if I can manually merge the data.
Thanks again for your help!
0 -
Let us know how you get along @boogybren :smile: Fingers crossed everything goes smoothly!
0 -
I had to do a modified version of Drew's instructions but it worked.
Because MBP A had the most data but wasn't the most current, I exported the newest data from MBP B then stopped syncing and deleted the iCloud data. I also made any other 1PW client stop syncing and erased the local data.
I started a fresh sync with MBP A then added all of my other 1PW clients. Once sync'd, I imported the newest data.
So far, everything is happy!
0 -
That's great to hear @boogybren, hopefully there are no surprises and everything is once again good :smile:
0
