Model Merge

When you load an AUTOSAR project whose content is spread across several ARXML files, Model Merge combines that data into one consistent internal model. Whenever values cannot be combined safely, DaVinci Configurator reports a conflict for you to resolve.

Topics to dive deeper:

Benefits of the New Model Merge Behavior — why transparent conflict detection improves project quality and traceability.
Model Merge Report — how to read the generated SARIF report and locate the affected ARXML content.
Model Merge Conflicts — the conflict types and how to resolve them.
Automatic Conflict Resolution — when best-effort automatic handling helps and what to verify before saving.
Behind the Scenes — the priority logic that drives merge results.

If your project has merge conflicts, follow the Concepts and Steps described below.

Concepts

AUTOSAR elements are either splitable (you may distribute them across files) or non-splitable (you must define them in exactly one place). Either kind causes a merge conflict when the same information is configured inconsistently. DaVinci Configurator categorizes each conflict as solvable or non-solvable and, depending on the type, resolves it automatically or asks you to fix it manually.

Table 1. Terms
Term	Description
Splitable	Configuration you can distribute across multiple ARXML files.
Non-Splitable	Configuration you must define in exactly one place.
Solvable Conflicts	DaVinci Configurator can apply optional Automatic Conflict Resolution, or you resolve them manually.
Implicitly Resolved Conflicts	DaVinci Configurator always resolves these internally, even without Automatic Conflict Resolution. See Implicitly Resolved Conflicts.
Non-Solvable Conflicts	DaVinci Configurator has no automatic strategy, so you must resolve them manually.

Steps

Open your DaVinci Project.
DaVinci Configurator Version 6 loads it and merges the ARXML files into the internal model. It writes a Model Merge Report (ModelMergeReport.sarif) to Output/Log/ProjectLoad, listing every conflict found.
If project load succeeds, Model Merge is done.
If project load aborts, Analyze the Conflicts and Solve the Conflicts, then reload and repeat these steps if necessary.

With Automatic Conflict Resolution active, DaVinci Configurator resolves all solvable conflicts in one load and reports them as warnings. Project load still aborts if any non-solvable conflicts remain, but only those are left for you to fix manually.

Analyze the Conflicts

Open ModelMergeReport.sarif to review the conflicts. For the best experience, use the SARIF Viewer in VS Code, which highlights the affected ARXML locations. For the file structure and limitations, see Model Merge Report.

Solve the Conflicts

Resolve each conflict manually by type (see Model Merge Conflicts), or turn on Automatic Conflict Resolution to let DaVinci Configurator merge the solvable ones for you.

Automatic resolution cannot handle every conflict. Resolve the remaining non-solvable conflicts manually, then reload the project to verify.