Method processResolvedConflicts

modules/core/UploaderSystem.js:451–468

()

  processResolvedConflicts() {
    const editor = this.context.systems.editor;

    for (const conflict of this._conflicts) {
      if (conflict.chosen === 1) {   // user chose "use theirs"
        const graph = editor.staging.graph;
        const entity = graph.hasEntity(conflict.id);
        if (entity?.type === 'way') {
          for (const child of utilArrayUniq(entity.nodes)) {
            editor.perform(actionRevert(child));
          }
        }
        editor.perform(actionRevert(conflict.id));
      }
    }

    this.save(true, false);  // tryAgain = true, checkConflicts = false
  }
}