Conflict resolution

You have several options for resolving conflicts:


Conflict resolution with resolve_conflict scripts
Conflict resolution with upload_update scripts