These days application data can be modified (created/updated/deleted etc) from multiple sources, such as a iphone application and a web application. What techniques are considered best practice when it comes to conflict resolution? Sa ...