Sample 4: Demonstrate item conflict resolution

 

 

Starting State:  v4.xml

 

 

Endpoint 2 updates:

 

Result: v5.xml

  

 

Notable Observations:

 

<entry>

<sx:sync id="ep1.100" updates="5" deleted="false" noconflicts="false">

<sx:history sequence="5" when="2007-01-19T00:14:40Z" by="EP2" />

<sx:history sequence="4" when="2007-01-19T00:14:38Z" by="EP1" />

<sx:history sequence="4" when="2007-01-19T00:14:39Z" by="EP2" />

<sx:history sequence="3" when="2007-01-19T00:14:38Z" by="EP2" />

<sx:history sequence="2" when="2007-01-19T00:14:38Z" by="EP1" />

<sx:history sequence="1" when="2007-01-19T00:14:37Z" by="EP1" />

</sx:sync>

<title>Buy Groceries - DONE</title>

<content>Get milk, eggs, butter and bread</content>

<id>urn:uuid:43F7C02D-1E98-4e61-B3DE-BD40B16F3662</id>

<author>

<name>EP2</name>

</author>

<updated>2007-01-19T00:14:40Z</updated>

</entry>