How to resolve conflict 1Password 4

Luds
Luds
Community Member

Hello,
Could you please confirm if there is an automatic tool resolve conflict 1Password 4 ?

If not how do you manually resolve conflict 1Password 4.

I see to have a number of items that say (conflict or conflicted) in the following location 1Password [Principal].agilekeychain\data\default

Thanks in advance for your help. :)

Comments

  • littlebobbytables
    littlebobbytables
    1Password Alumni

    Hi @Luds,

    Here's a quick overview of how these files come into existence. When you use Dropbox it sets aside some space on your physical hard drive ~/Dropbox/ and it monitors this folder. When you do anything to this folder, create, edit or delete a file it pushes a copy of this to the Dropbox server. Now imagine for some reason that you've caused a change of some kind on computer A and that before this change has been first pushed to Dropbox's server and then pulled down by computer B that the file in question has also been altered on computer B. Dropbox realises it has two copies of the same file that has been edited in two locations. As it can't say which is correct one version is kept with the correct filename and a conflict file is created.

    Now all of this you may have already known. 1Password knows about how Dropbox handles conflicts too and it should merge the differences when it finds them. What we do is we create conflict sections and store one version of the edited fields there. So say you've edited a password for a single Login item in two places. Dropbox can't see the contents of the file at all as it's encrypted and even after 1Password has finished comparing the the unencrypted version of the file it doesn't want to make the call. Se we create the Conflicts section and leave it up to the user to decide what is correct.

    After we've finished merging conflict files they should be pruned automatically. Now when I say automatically that isn't the same as immediately, the files seem to exist for a brief period before being removed. Saying that as long as everything is working properly they shouldn't exist for even a moderate amount of time and I'm meaning more hours at most. If they're hanging around for longer it might suggest something has become gnarled up and we need to take a look.

    Does that help at all? If you have any follow up questions do please ask :smile:

This discussion has been closed.