Solve ARXML File Merge Conflicts

This section describes the step-by-step resolution of model merge conflicts between ARXML files for the new project structure of your DaVinci Configurator Classic Version 6 projects, migrated via Project Migration Tool.

Prerequisites

Installation

  • DaVinci Configurator Classic Version 6 (see Installation)

  • Editor of your choice (e.g., VS Code)

Input

Steps

  1. Load DaVinci Project.

  2. If the project could not be loaded successfully, follow these steps:

    1. Analyze Conflicts.

    2. Solve Conflicts.

  3. If the project could be loaded successfully, continue with Update BSW Package.

Load DaVinci Project

  1. Open your migrated DaVinci Project.
    DaVinci Configurator Classic Version 6 tries to load the project and merge the ARXML files inside the new Project Structure.
    A ModelMergeReport.sarif file is generated inside the Output/Log/ProjectLoad directory.

The ModelMergeReport.sarif file contains model merge conflicts (errors and warnings) that were found during the loading of your DaVinci Project. If automatic conflict resolution is enabled (see Prerequisites), it also contains information about automatically resolved conflicts.

Analyze Conflicts

By SARIF Viewer

  1. Open the generated ModelMergeReport.sarif file (see Load DaVinci Project) in your VS Code.

  2. Open the Results panel of SARIF Viewer in your editor (see SARIF Viewer for support).

  3. Check the Results panel of SARIF Viewer for found conflicts.

By File

  1. Open the ModelMergeReport.sarif file (see Load DaVinci Project) in your editor.

  2. Check the results block inside the file for found conflicts.

See Model Merge Report for more information on the file structure, format and limitations of the SARIF Report.

Solve Conflicts

  1. Solve model merge conflicts (found in Analyze Conflicts)

    1. Solve conflicts manually by conflict type:

      Conflict Type Solution

      "Illegal Model Split"

      How to Manually Solve Conflict "Illegal Model Split"

      "Missing Variation Point"

      How to Manually Solve Conflict "Missing Variation Point"

      "Missing or Conflicting Short Labels in Variation Point"

      How to Manually Solve Conflict "Missing or Conflicting Short Labels in Variation Point"

    2. Solve conflicts with Automatic Conflict Resolution.

      Not all conflicts can be resolved automatically. Fix all remaining non-solvable conflicts manually.

  2. Reload the DaVinci Project and fix open conflicts (as described in Steps).