Die Übersetzung dieser Seite ist veraltet. Klicken Sie hier, um die neueste Version auf Englisch zu sehen.

Modellvergleich

Vergleich von Modellen, um Änderungen zu identifizieren oder Unterschiede zwischen Modellen zusammenzuführen

Mit dem Comparison Tool und dem Three-Way Merge Tool können Sie Simulink^® Modelle miteinander vergleichen und Änderungen überprüfen, zusammenführen und speichern. Vorlagen für Modelle und Projekte vergleichen. Konflikte in Modellen mit Versionskontrolle lösen und Diff- und Zusammenführungsprozesse bei der Verwendung externer Tools zur Versionskontrolle anpassen. Weitere Informationen erhalten Sie im Video Mithilfe von Projekte zusammenarbeiten, Änderungen verfolgen und zusammenführen sowie Code-Reviews durchführen (4 Min., 50 Sek.).

Tools

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

Funktionen

visdiff Compare two files or folders

Themen

Review Changes in Simulink Models

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

Enthaltene Beispiele

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.

Live Script öffnen

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.

Live Script öffnen

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.

Live Script öffnen