模型比较

比较模型以识别更改或将模型之间的差异合并

使用比较工具和三向合并工具比较 Simulink^® 模型，并审核、合并和保存更改。比较模型和工程的模板。在源代码管理下解决模型中的冲突，并在使用外部源代码管理工具时自定义差异分析和合并过程。有关详细信息，请观看使用工程来协作、跟踪和合并更改并执行代码审查（4 分 50 秒）。

工具

比较工具	Diff and merge changes between Simulink models
三向合并工具	Resolve conflicts in Simulink models

函数

visdiff 比较两个文件或文件夹

主题

查看 Simulink 模型中的更改

查看及合并模型之间的更改，显示 Simulink 编辑器中的更改，过滤并保存比较结果。
- 步骤 1: Select Models to Compare
- 步骤 2: Understand Simulink Model Comparison Changes
- 步骤 3: Export, Print, and Save Model Comparison Results
- 步骤 4: 比较报告中的移植或还原模型更改
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.
- 步骤 1: Make Changes and Merge Git Local Branch
- 步骤 2: Identify Order of Resolving Conflicts in Changeset
- 步骤 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.

精选示例

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. You can view and merge the Simulink model differences in the resulting report.

打开实时脚本

模型比较

工具

函数

主题

相关信息

精选示例

Compare and Merge Simulink Models

Compare and Merge Simulink Models Containing Stateflow

Resolve Conflicts in Project Using Simulink Three-Way Merge

WeChat