System Composer Three-Way Merge Tool
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
Parameters
More About
Version History
Introduced in R2023b