Main Content

System Composer Three-Way Merge Tool

Resolve conflicts in System Composer models

Since R2023b

expand all in page

Description

The Three-Way Merge Tool in System Composer™ is an interactive tool for resolving conflicts in a System Composer architecture model.

Conflicts in System Composer model files can occur when multiple team members work simultaneously on the same model and keeping both changes in the merged model is not possible. To resolve these conflicts, the Three-Way Merge Tool displays the changes made to each model with respect to the common parent model.

Using the Three-Way Merge Tool, you can:

  • Visualize and highlight changes in the System Composer editor.

  • Choose which changes you want to keep in the merged model.

For the Simulink® version of this tool, see Simulink Three-Way Merge Tool.

Three-Way Merge Tool

Open the System Composer Three-Way Merge Tool

Current Folder browser or Project Files browser — In a folder or a MATLAB® project under source control, to resolve conflicts in a System Composer model, right-click the model file and select Source Control > View Conflicts.

Examples

Parameters

expand all

Navigate between conflict or manual merge in the three-way merge report.

Synchronize the scrolling between the panes for the Mine, Theirs, and Base models.

Highlight the currently selected report node in the models in the System Composer editor or in the model Configuration Parameters dialog box.

By default, the tool opens the Theirs and Target models to the right of the three-way merge report. You can choose to open and highlight changes in models from different panes by using the Top Model and Bottom Model options.

Highlight section of the Three-Way Merge Tool toolstrip.

By default, the tool opens the Theirs and Target models to the right of the three-way merge report. You can choose to open and highlight changes in models from different panes by using the Top Model and Bottom Model options.

Clear Always Highlight to use the Highlight Now button and control highlighting in the models.

After you finish resolving conflicts and manually merging items that require your attention in the target file, accept the changes and close the report and the models. Clicking Accept & Close saves the target file with all your merges and marks the conflicted file resolved in the source control tool.

If you wish to save your progress and continue resolving the conflicts later, select Accept and Close > Save and Close instead.

More About

expand all

Version History

Introduced in R2023b

See Also

| |

Topics