Sync 2.0 Sprint 12 review - conflict resolution

We’ve finished Sprint 12.

Sprint goal: Conflict resolution

Sprint tickets:

The most important tickets connected with sprint goal :

Wiki -

cc/ @abendor @simba @jslawinski @c.antwi @burke

Because of problems with demo servers (more info here - Configuration problem on sync demo servers) we did not organize sprint demo call in this week, however as soon as we fix the problems, we will organize a meeting with OpenMRS community.