Cannot merge Dropbox existing file with new one

hirschwrites
hirschwrites
Community Member

Problem started with my iPhone 6 not syncing with my iMac through Dropbox. So, I went into Dropbox on iPhone and did a new "link to computer" which reinstalled DB on my iMac. I have 1Password4 on iMac and most updated version on iPhone. So, I went into 1Password preferences and told it to stop syncing with DB. Then I asked it to sync and it told me there were files to merge. And it asked for my password. I have put in my Agilebits password, but it rejects it. Now I'm stuck since I cannot sync anything!

Comments

  • littlebobbytables
    littlebobbytables
    1Password Alumni

    Hi @hirschwrites,

    I assume that you currently unlock 1Password using either a PIN or Touch ID at the moment. I would recommend not rebooting your phone until we resolve this as you will be asked for your Master Password and unless you know for certain you can unlock 1Password for iOS you might find yourself locked out of your vault entirely.

    So two possibilities spring to mind:

    1. Have you changed your Master Password at all recently (maybe not even that recently) and have you tried the previous one?
    2. Do you have more than one 1Password.agilekeychain in your Dropbox space and if you do are you sure you're attempting to use the correct one? By default 1Password for iOS will create the 1Password.agilekeychain in /Dropbox/Apps/1Password/

    If neither of those work there is still a way of pulling your vault from your iOS device as long as you can still unlock the vault using either the PIN or Touch ID and here is how.

    1. I would advise following the Starting Over guide on your Mac if the iPhone does hold your most updated version, this way you know everything will be pulled from the phone.
    2. Then, create a fresh blank vault with a new Master Password.
    3. Follow our Wi-Fi Sync guide. The iPhone will ask for the Master Password of this empty vault as the Mac is the server in this scenario (which works to our advantage) and will copy the entire contents of your iOS vault to your Mac.
    4. At this point you will probably want to revert to Dropbox. I would recommend moving all .agilekeychain folders from Dropbox to somewhere out of the way.
    5. Follow our Sync with Dropbox. At this point both devices should be using the same Master Password and it is worth confirming this.

    If you have any questions relating from any of this please do ask before starting.

This discussion has been closed.