Robust Sync Conflict Resolution

  1. Prioritizing newer changes is not always the right choice.

  2. It was archived because it is considered complete not because it’s bad.

  3. We have chosen merge and use sync history in case there are problems.