conflict resolution

mtai33 · June 5, 2009

I run Zotero on two computers; a mac OSX 10.5.4 and a Windows XP. Yesterday I upgraded to 2.0b5 on both systems. Since then whenever I click on the sync button, a "conflict resolution' window pops up with one record (local object, remote object, merged object). The only thing I can do is close the window but it pops up again after a minute or two. This happens only on the Windows PC, not the Mac. Moreover, the two collections are not identical. Some records entered in the PC are missing from the Mac.

noksagt · June 5, 2009

You should be able to choose if you want the local or remote object by clicking on it & then click the lower right hand button to advance to the next conflict or to accept your choices.

mtai33 · June 5, 2009

Thanks :) I didn't notice the buttons at the bottom of the window. I have a 10-inch netbook too small to show the entire conflict resolution window without some shifting around.