Conflict resolver

thightower

Guys, I hope its just late and I am missing it, but where is the conflict resolver for the MAS version.



I had to reset my Dropbox sync this evening and I saw on my iPad that conflicts were generated, and I verified it by looking into the keychain. But the resolver never launches and I can't find a way to launch it in this version.



Any ideas, of course you could tell me to go get some coffee but...



Since my Data from the iPad was older I deleted the conflicts myself but the resolver would have been handy.

JoelMarcey

+1 to this question. I cannot find the resolver either. It is not under Help as I thought it might be.

khad

If you are having trouble with this, it is possible that you have previously disabled the Sync Conflict Resolver. Please open Terminal (found in your /Applications/Utilities folder). Copy and paste this line into Terminal and press Return:



[CODE]defaults write ws.agile.1Password ShowSyncConflictResolverAutomatically -bool YES[/CODE]

The Sync Conflict Resolver should then pop up if there are conflicts to be resolved. <img src='http://forum.agilebits.com/public/style_emoticons/<#EMO_DIR#>/skype_smile.png' class='bbc_emoticon' alt=':-)' />

thightower

khad



This has no effect on the showing the resolver in the MAS 3.9.1



Again I watched my iPhone show conflicts and no it did not start the resolver so whats next on the list to try <img src='http://forum.agilebits.com/public/style_emoticons/<#EMO_DIR#>/tongue.png' class='bbc_emoticon' alt=':P' />

feldmann

I too am looking for the resolver. I changed by Dropbox email address and had to turn off - and then back on - syncing as a result. Before that I went on a changing email spree in 1Password for MAS and now all of the entries I touched have a Password1 and Password2 field, etc. Do I have to manually go through and fix these? Hmm....

khad

Hey folks, I just want to make sure that we are on the same page. The Sync Conflict Resolver should only show up if there are Dropbox sync "conflicted copies" in your data file. This is a a technical term which is different than "duplicates" or "similar items".



You can see any “conflicted copy” files by ctrl-clicking on your 1Password.agilekeychain data file in Finder and selecting “Show Package Contents” from the shortcut menu. Click the “data” folder and then the “default” folder inside that. These are the all the files that each represent an item in 1Password.



Can you confirm that you are seeing files with the words "conflicted copy" in their names in your ./data/default folder inside your data file but that the Sync Conflict Resolver is still not showing up?



I'm going to do some more testing to see if there is a problem with the Sync Conflict Resolver not popping up when it should in 3.9.1, but please let me know what you uncover.

thightower

Yes it is conflicted copies



They are indeed showing up I have geek tool display a screen dialogue every time there is any conflicted copies in my Dropbox. Watching for problems with my vaults etc. I also see them created from within the 1P app on the iPhone or iPad. There has to be an issue present. If need be I can give screen shots or similar. Here is the text from the last manual delete I did.



One other note I never use to have as many conflicts created almost never. Clearly there need to be more work done to ensure compatibility between the extension and the app. IMHO



From my last manual delete.





Dropbox keeps a snapshot every time you save a file. You can preview and restore '7E<snipped>F2E (T Hightower’s iPhone 4S's conflicted copy 2011-10-29).1password' by choosing one of the versions below:

amertner

Did this topic go anywhere? I have a bunch of conflicts after changing my dropbox password, and I can't find the resolver anywhere.



Please advise - I am on 3.9.2 on Lion.



Allan

thightower

Hey amertner



I don't think so I personally have seen no change to this, The team just announced beta versions of the 3.9 series and I have seen no mention of it but they are just getting started.



I will try to remember to update the thread if I see anything in the coming betas that indicate a fix.





Tommy

khad

Sorry for my misleading posts above. The Sync Conflict Resolver was removed in 3.9. (I run about 4 different versions of 1Password on my machine, so it is sometimes hard to keep track of all the changes and in which version they were made.)



We would have left it in the MAS version. However, all Sync Conflict Resolver code was in 1Password.app which is now sandboxed. In the sandbox mode it cannot access the files directly to find the conflicts. Basically, it requires a complete rewrite, and we are working to improve it in a future update.



If, for some reason, the conflicted copies are actually causing a problem, you can remove them manually from your data file. Just archive items with "conflicted copy" in their filename. However, this should not be necessary.

thightower

Thank you Sir,



I assume the re write will have it in the browser extensions possibly ?

khad

I don't have any details on it at this time.

Kknight78

Any news on the conflict resolver in 3.9.x? I have quite a few conflicted copies, and while I don't think they are causing any problems, it would be nice to resolve them just to be sure.

khad

We don't normally pre-announce products or features. Dropbox should handle the conflicts very well automatically. Is there something specific you are having trouble with? I'd love to help if you provide some more details.

Kknight78

No, no problems that I've noticed...just my OCD personality doesn't like seeing so many "conflicted copies" and wondering whether something has changed that shouldn't have <img src='http://forum.agilebits.com/public/style_emoticons/<#EMO_DIR#>/skype_tongueout.png' class='bbc_emoticon' alt=':-P' />

khad

Please do feel free to archive them as I mentioned above to assuage the cognitive dissonance. <img src='http://forum.agilebits.com/public/style_emoticons/<#EMO_DIR#>/smile.png' class='bbc_emoticon' alt=':)' />



I've not seen a single case so far where deleting them is the wrong thing to do since the most recent change is always the one that Dropbox goes with, but better safe than sorry. That's why I recommend archiving instead of deleting.



For me, I never look inside my data file since it really shouldn't be modified by hand anyway. Proceed with caution.

Kknight78

[quote name='khad' timestamp='1344644905' post='61408']For me, I never look inside my data file since it really shouldn't be modified by hand anyway. Proceed with caution.[/quote]



No problem...if they indeed aren't anything to be concerned about, then I'll just leave them alone and not worry about it. I assume they must have happened when two devices tried to sync at the same time or something since I only make changes/additions on my main computer and then let them sync to everything else...there should never have been changes to two different devices that would then potentially cause a conflict...that's what made me curious about them in the first place. Thanks <img src='http://forum.agilebits.com/public/style_emoticons/<#EMO_DIR#>/skype_smile.png' class='bbc_emoticon' alt=':-)' />

khad

Yep. I wouldn't be worried about them. If you are interested [just a bit] more detail, here is what I wrote in the User Guide:



If ever you make a change on more than one computer or device that conflicts with another change, Dropbox will create a “conflicted copy” of the file automatically.



Because Dropbox syncs so quickly, sync conflicts are not usually an issue because a change from one computer is almost instantaneously reflected on all your other computers and devices. Thus, the most common reason for conflicts to appear is if you are making changes while offline.



When you are offline, Dropbox does not have a chance to work its magic and sync the changes across all your computers and devices. So if you change the same file in two different locations and then reconnect both of them to the Internet, Dropbox will preserve the changes you made in both locations by creating a duplicate of the file with the words “conflicted copy” in the file name. Also included in the file name will be the name of the computer or device which made the changes producing the conflict as well as the date of the conflict.



A 1Password data file is what is known in Mac OS X as a “bundle” which is a fancy way of making a collection of files appear to the system as a single file. This facilitates better syncing — and, believe it or not, fewer conflicts — because each item in 1Password is actually stored as a separate file inside the bundle. If you just edit one item, only that file is synced rather than the entire data file.



If you are interested, you can see all the “conflicted copy” files by ctrl-clicking on your 1Password.agilekeychain data file in Finder and selecting “Show Package Contents” from the shortcut menu. Click the “data” folder and then the “default” folder inside that. These are the all the files that each represent an item in 1Password.

Kknight78

[quote name='khad' timestamp='1344728106' post='61429']Yep. I wouldn't be worried about them.[/quote]



OK, I won't be then <img src='http://forum.agilebits.com/public/style_emoticons/<#EMO_DIR#>/skype_smile.png' class='bbc_emoticon' alt=':-)' />



[quote name='khad']If you are interested [just a bit] more detail, here is what I wrote in the User Guide:[/quote]



I am, thanks for the explanation.



[quote name='khad']If ever you make a change on more than one computer or device[/quote]

[quote name='khad']the most common reason for conflicts to appear is if you are making changes while offline.[/quote]

[quote name='khad']if you change the same file in two different locations and then reconnect both of them to the Internet[/quote]



Not a big deal, and it's just curiousity at this point since the conflicts are nothing to be concerned about...but this is where I'm still confused. If none of the above cases apply, how would conflicted copies come to be? All of my conflicted copies say either "iPad" or "iPhone", but the only thing I use the iPad or iPhone app for is to copy and paste passwords, so there shouldn't be any changes made from those devices that would cause conflicts. I've never (to my knowledge) created or edited a record on the iPhone or the iPad...unless merely using the app makes changes to the file (accessed or modified dates maybe?).



Anyway, thanks again for the info. <img src='http://forum.agilebits.com/public/style_emoticons/<#EMO_DIR#>/skype_smile.png' class='bbc_emoticon' alt=':-)' />

khad

There is some metadata that is saved even when accessing the data (as you suggest).