Comparación de modelos

Compare los modelos para identificar los cambios o fusionar las diferencias entre ellos

Utilice Comparison Tool y Three-Way Merge Tool para comparar modelos de Simulink^® y revisar, fusionar y guardar cambios. Compare plantillas de modelos y proyectos. Resuelva conflictos en modelos bajo control de versiones y personalice el proceso de diferenciación y fusión cuando utilice herramientas externas de control de versiones. Para obtener más información, vea el vídeo Uso de proyectos para colaborar, seguir y fusionar cambios y realizar revisiones de código (4 min, 50 s).

Herramientas

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

Funciones

visdiff Compare two files or folders

Temas

Review Changes in Simulink Models

Review and merge changes between models, display changes in the Simulink Editor, and filter and save comparison results.
- PASO 1: Select Models to Compare
- PASO 2: Understand Simulink Model Comparison Changes
- PASO 3: Export, Print, and Save Model Comparison Results
- PASO 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.
- PASO 1: Make Changes and Merge Git Local Branch
- PASO 2: Identify Order of Resolving Conflicts in Changeset
- PASO 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.

Información relacionada

Uso de proyectos para colaborar, seguir y fusionar cambios y realizar revisiones de código (4 min, 50 s)

Ejemplos destacados

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.

Abrir script en vivo

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.

Abrir script en vivo

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.

Abrir script en vivo