System Composer Three-Way Merge Tool

Resolve conflicts in System Composer models

Since R2023b

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 it is not possible to keep both changes in the merged model. To resolve these conflicts, the Three-Way Merge Tool displays the changes made to each of the models with respect to the common parent.

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.

×

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

• Resolve Conflicts in Projects Using System Composer Three-Way Merge Tool
• Resolve Conflicts in Models Using Three-Way Merge
• Resolve Conflicts in Project Using Simulink Three-Way Merge

Parameters

Next/Previous — Go to next or previous conflict or manual merge

button

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

Linked Scrolling — Option to synchronize scrolling between panes in the report

on (default) | off

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

Highlight Now — Highlight currently selected report node in System Composer editor

button

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

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.

Always Highlight — Option to always highlight differences in models

on (default) | off

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.

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

Accept & Close — Accept merge resolution and close report and models

button

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

Terminology in Three-Way Merge Report

• The Three-Way Merge Tool classifies the items in the report into four categories: Conflict, conflicted manual merge, manual merge, and automatic merge.

  

  The tool follows these criteria to classify the items that require your attention.

  	Tool can make the decision of which change to keep	Tool cannot make a decision of which change to keep. The user must make an informed decision.
  Tool can perform the required change in the System Composer editor. (Option buttons appear in row)	Automatic	Conflicted
  Tool cannot perform the change. The user must make the change manually in the System Composer Editor. (Option buttons do not appear in row)	Manual merge	Conflicted manual merge

• This table explains the different terminology that the three-way merge report uses.

  Terminology	Explanation
  Mine	Represents the current version of your model file that includes local changes, placed on the right-hand side of the report.
  Theirs	Represents the version of the same model file from another user, placed on the left-hand side of the report.
  Base	Represents the most recent common version of the model files, placed in the center of the report.
  Target	A temporary file that opens in the Target pane where you decide if you want to take changes from the Mine, Theirs, or Base file.
  Option buttons	Buttons next to individual rows in the target file. These buttons enable you to make choices between changes in the Mine, Theirs, or Base file. If buttons do not appear next to a row, you must manually modify the files in the System Composer editor to resolve the conflict.

Colors in Three-Way Merge Report

The Three-Way Merge Tool highlights the rows in the report according to the type of difference. This table provides a summary of the colors used in the report.

Type of report item	Color	Description
Mine	Purple	Item resolved by selecting the Mine change.
Base	Black	Item resolved by selecting the Base change.
Theirs	Blue	Item resolved by selecting the Theirs change.
Conflict or manual merge	Red	Item is not resolved yet. Item requires a manual action from the user.

Version History

Introduced in R2023b