Confronto del modello
Utilizzare Comparison Tool e Three-Way Merge Tool per confrontare i modelli di Simulink® e rivedere, unire e salvare le modifiche. Confrontare i template per i modelli e i progetti. Risolvere i conflitti nei modelli con controllo della sorgente e personalizzare il processo di differenziazione e unione quando si utilizzano strumenti di controllo della sorgente esterni. Per ulteriori informazioni, guardare Using Projects to Collaborate, Track, and Merge Changes and Perform Code Reviews (4 min, 50 sec) (Utilizzare i progetti per collaborare, tracciare e unire le modifiche ed eseguire revisioni di codice).
Strumenti
| Comparison Tool | Diff and merge changes between Simulink models |
| Simulink Three-Way Merge Tool | Resolve conflicts in Simulink models |
Argomenti
- Review Changes in Simulink Models
Review and merge changes between models, display changes in the Simulink Editor, and filter and save comparison results.
- PASSAGGIO 1: Select Models to Compare
- PASSAGGIO 2: Understand Simulink Model Comparison Changes
- PASSAGGIO 3: Export, Print, and Save Model Comparison Results
- PASSAGGIO 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.
- PASSAGGIO 1: Make Changes and Merge Git Local Branch
- PASSAGGIO 2: Identify Order of Resolving Conflicts in Changeset
- PASSAGGIO 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.
- 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.
Informazioni complementari
Esempi in primo piano
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.
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.
Resolve Conflicts in Project Using Simulink Three-Way Merge
Use the Simulink® Three-Way Merge tool to resolve conflicts in Simulink models in a project. You can view and merge the Simulink model differences in the resulting report.
