Three-Way Model Merge
The three-way model merge tool helps resolve two conflicting design changes made to the same model when working on a team project.
The three-way model merge tool, when used in conjunction with Simulink® Projects, displays a comparison report with three versions of the conflicted file: theirs (changes made by other team members), mine (changes made by the user locally), and base (the original file). While most differences are automatically merged by the tool itself, the ones that are marked in red require manual inspection.
Detailed merge results are displayed in the ‘Target’ pane at the bottom of the UI. You can navigate between the conflicts and the tool allows you to visualize the differences side by side. The conflicts that require manual inspection can be instantly resolved within the tool itself.
Published: 23 Feb 2016
Featured Product
Simulink Report Generator
Up Next:
Related Videos:
您也可以从以下列表中选择网站:
如何获得最佳网站性能
选择中国网站(中文或英文)以获得最佳网站性能。其他 MathWorks 国家/地区网站并未针对您所在位置的访问进行优化。
美洲
- América Latina (Español)
- Canada (English)
- United States (English)
欧洲
- Belgium (English)
- Denmark (English)
- Deutschland (Deutsch)
- España (Español)
- Finland (English)
- France (Français)
- Ireland (English)
- Italia (Italiano)
- Luxembourg (English)
- Netherlands (English)
- Norway (English)
- Österreich (Deutsch)
- Portugal (English)
- Sweden (English)
- Switzerland
- United Kingdom (English)
亚太
- Australia (English)
- India (English)
- New Zealand (English)
- 中国
- 日本Japanese (日本語)
- 한국Korean (한국어)