Resolving conflicts

You have several options for resolving conflicts:


Resolving conflicts with resolve_conflict scripts
Resolving conflicts with upload_update scripts