This is a staging forum for AgileBits, not an official support forum. Visit http://discussions.agilebits.com instead.
Conflict Resolver Window - How to Use
Here is an explanation on using the conflict resolver when syncing the desktop to the iPhone/iPod Touch:
I have created two items and synced them to both devices. I have named them Conflict Test 1 and Conflict Test 2. I then may separate edits to each entry between syncs. This creates a conflict. Thus when I sync again I am presented with a conflict window.
Note that the username is different. However, what this one doesn't show very well is that the password is different between the two as well. (it was changed on the desktop)
[IMG]http://cdn.agile.ws/carl/ConflictResolver1.png[/IMG]
Here is a more clear conflict with an explanation of the window areas. This makes it a little clearer to see that something was changed on each side separately.
[IMG]http://cdn.agile.ws/carl/ConflictResolver2.png[/IMG]
For each conflict that is being shown we have the option of choosing which one is the correct one. This is accomplish via the gear menu as shown below.
[IMG]http://cdn.agile.ws/carl/ConflictResolver3.png[/IMG]
In my example, pressing 1 means to use the one from the iMac. Pressing 2 means to use the iPhone version. You can use the menu each time or the previously mentioned keyboard shortcuts. We can also choose the iMac version for all the conflicts or choose the iPhone version for all the conflicts. (Control - 1 or 2 on keyboard)
Or you could forget the keyboard and the gear menu and click directly on the window:
[IMG]http://cdn.agile.ws/carl/ConflictResolver5.png[/IMG]
Notice that when you choose one or the other, an icon appears next to each of the items in the leftmost pane showing us which one we have selected.
[IMG]http://cdn.agile.ws/carl/ConflictResolver4.png[/IMG]
If you don't want to choose either side, you can choose Skip and they will remain conflicted and will appear again next time you sync.
Hope this helps. :)
I have created two items and synced them to both devices. I have named them Conflict Test 1 and Conflict Test 2. I then may separate edits to each entry between syncs. This creates a conflict. Thus when I sync again I am presented with a conflict window.
Note that the username is different. However, what this one doesn't show very well is that the password is different between the two as well. (it was changed on the desktop)
[IMG]http://cdn.agile.ws/carl/ConflictResolver1.png[/IMG]
Here is a more clear conflict with an explanation of the window areas. This makes it a little clearer to see that something was changed on each side separately.
[IMG]http://cdn.agile.ws/carl/ConflictResolver2.png[/IMG]
For each conflict that is being shown we have the option of choosing which one is the correct one. This is accomplish via the gear menu as shown below.
[IMG]http://cdn.agile.ws/carl/ConflictResolver3.png[/IMG]
In my example, pressing 1 means to use the one from the iMac. Pressing 2 means to use the iPhone version. You can use the menu each time or the previously mentioned keyboard shortcuts. We can also choose the iMac version for all the conflicts or choose the iPhone version for all the conflicts. (Control - 1 or 2 on keyboard)
Or you could forget the keyboard and the gear menu and click directly on the window:
[IMG]http://cdn.agile.ws/carl/ConflictResolver5.png[/IMG]
Notice that when you choose one or the other, an icon appears next to each of the items in the leftmost pane showing us which one we have selected.
[IMG]http://cdn.agile.ws/carl/ConflictResolver4.png[/IMG]
If you don't want to choose either side, you can choose Skip and they will remain conflicted and will appear again next time you sync.
Hope this helps. :)
Flag
0
This discussion has been closed.