Comparaison de modèles

Comparer des modèles pour identifier les modifications ou fusionner les différences

Utilisez Comparison Tool et Three-Way Merge Tool pour comparer les modèles Simulink^®, et passer en revue, fusionner et enregistrer les modifications. Comparez les templates pour modèles et pour projets. Résolvez les conflits dans les modèles sous contrôle de version et personnalisez le processus de différenciation et de fusion lorsque vous utilisez des outils de contrôle de version externes. Pour plus d'informations, regardez la vidéo Using Projects to Collaborate, Track, and Merge Changes and Perform Code Reviews (4 min 50 s).

Outils

Comparison Tool	Diff and merge changes between Simulink models
Three-Way Merge Tool	Resolve conflicts in Simulink models

Fonctions

visdiff Compare two files or folders

Rubriques

Review Changes in Simulink Models

Review and merge changes between models, display changes in the Simulink Editor, and filter and save comparison results.
- ÉTAPE 1: Select Models to Compare
- ÉTAPE 2: Understand Simulink Model Comparison Changes
- ÉTAPE 3: Export, Print, and Save Model Comparison Results
- ÉTAPE 4: Port or Restore Model Changes in Comparison Report
Resolve Conflicts in Models Under Source Control

Identify and understand conflicts in your models under Git™ source control, and resolve conflicts using Three-Way Merge Tool and merge changes.
- ÉTAPE 1: Make Changes and Merge Git Local Branch
- ÉTAPE 2: Identify Order of Resolving Conflicts in Changeset
- ÉTAPE 3: Resolve Conflicts in Models Using Three-Way Merge
Set Up Simulink Diff and Merge in CI/CD Pipeline

Diff Simulink models in continuous integration (CI) workflows. Automatically attach the comparison reports as an artifact for easy viewing outside of MATLAB^® and Simulink.
- Attach Model Comparison Report to GitHub Pull Requests
- Automatically Merge Models
Compare Model or Project Templates
Compare model or project templates (SLTX files) and create a comparison report.
Customize External Source Control to Use MATLAB for Diff and Merge
Use the MATLAB Comparison Tool for diff and merge from external source control tools.

Informations connexes

Using Projects to Collaborate, Track, and Merge Changes and Perform Code Reviews (4 min 50 s)

Exemples présentés

Compare and Merge Simulink Models

Use the comparison report in MATLAB® to understand what has changed between two different designs. It shows how to view and merge the changes between two Simulink® models from the comparison report.

Ouvrir le live script

Compare and Merge Simulink Models Containing Stateflow

Use the comparison report in MATLAB® to understand what has changed between two different designs. It shows how to view and merge the changes between two Simulink® models containing Stateflow® using the comparison report. A Stateflow license is required to run this example.

Ouvrir le live script

Resolve Conflicts in Project Using Simulink Three-Way Merge

Use the Simulink® Three-Way Merge tool to resolve conflicts in Simulink models. You can view and merge the Simulink model differences in the resulting report.

Ouvrir le live script