Dropbox sync conflict resolution

Options
ash_m
ash_m
Community Member

Does 1Password6 auto resolve sync conflicts in Dropbox? The reason I ask is Dropbox notified me of a sync conflict on a 1Password file and shortly after, it notified me that the conflict file had been removed! So I'm thinking maybe 1Password handles this behind the scenes automagically?


1Password Version: Not Provided
Extension Version: Not Provided
OS Version: Not Provided
Sync Type: Not Provided

Comments

  • ag_kevin
    Options

    Hi @ash_m ,

    Yes - when there is a conflict file, 1Password will read both the original and conflict file, merge the two, and remove the conflict file. If there is data it can not merge (for example, if you edited a field to two different values on two devices), 1Password will add a "conflict field" to the item and put the extra value there. 1Password will not discard any data.

    I hope that answers your questions. Feel free to reply if you have further questions.

    Cheers,
    Kevin

  • ash_m
    ash_m
    Community Member
    Options

    Awesome work! Thanks @ag_kevin

  • ag_kevin
    Options

    Glad to help!

This discussion has been closed.