[Brian]

When it comes to resolving sync conflicts, most recent change (not sync) is the one that wins.

For performance reasons on the phone (which is about 2000 times slower than a desktop machine) we do this conflict resolution on a by-record basis, rather than a by-field basis.

Example which will cause a change to be lost:
Change due date of action on mac
Change note of same action on phone
sync mac
sync phone
Conflict: two edits to same record from two devices.
Result: due date change is ignored in favor of note change, which is more recent.

Example which will not cause a change to be lost:
Change due date of action on mac
sync mac
sync phone (fetching new due date)
change note of same action on phone
sync phone