Merge conflict behavior?

[Corey]

What is the behavior if there is a merge conflict?

For example, in the video demo, what would happen if you had also moved
the lunch event to a different day in Google Calendar:

A) before you press the sync button?
B) after you press the sync button but before you reload Google
Calendar in the browser?

Thanks!
Corey

[cwood]

Another excellent question! Conflict detection and resolution can be
one of the trickiest things about synchronization. Spanning Sync uses
Mac OS X Sync Services to detect and resolve conflicts. To see how it
works, check out the screenshots starting here:
http://spanningpartners.typepad.com/photos/screenshots/conflict1.html

Regards,
Charlie

[Corey]

Looks like a great solution. Thanks! -Corey