Skip to content
MathWorks - Mobile View
  • Sign In to Your MathWorks AccountSign In to Your MathWorks Account
  • Access your MathWorks Account
    • My Account
    • My Community Profile
    • Link License
    • Sign Out
  • Products
  • Solutions
  • Academia
  • Support
  • Community
  • Events
  • Get MATLAB
MathWorks
  • Products
  • Solutions
  • Academia
  • Support
  • Community
  • Events
  • Get MATLAB
  • Sign In to Your MathWorks AccountSign In to Your MathWorks Account
  • Access your MathWorks Account
    • My Account
    • My Community Profile
    • Link License
    • Sign Out

Videos and Webinars

  • MathWorks
  • Videos
  • Videos Home
  • Search
  • Videos Home
  • Search
  • Contact sales
  • Trial software
1:54 Video length is 1:54.
  • Description
  • Related Resources

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.

Related Products

  • Simulink Report Generator
  • Simulink

Simulink Projects

Bridging Wireless Communications Design and Testing with MATLAB

Read white paper
Related Information
Related Information
Merge Simulink Models From The Comparison Report

Feedback

Featured Product

Simulink Report Generator

  • Request Trial
  • Get Pricing

Up Next:

1:43
How to Create Web Views from Simulink Models

Related Videos:

4:45
Run a Simulink Model on Zynq: Exploring the Simulink Model...
2:38
Model-Based Design Applied: Students Use Model-Based Design...
2:31
Technische Universität München Helps Aerospace Companies...
42:18
Model-Based Design for Small and Mid-Sized Aerospace...

View more related videos

MathWorks - Domain Selector

Select a Web Site

Choose a web site to get translated content where available and see local events and offers. Based on your location, we recommend that you select: .

  • Switzerland (English)
  • Switzerland (Deutsch)
  • Switzerland (Français)
  • 中国 (简体中文)
  • 中国 (English)

You can also select a web site from the following list:

How to Get Best Site Performance

Select the China site (in Chinese or English) for best site performance. Other MathWorks country sites are not optimized for visits from your location.

Americas

  • América Latina (Español)
  • Canada (English)
  • United States (English)

Europe

  • 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
    • Deutsch
    • English
    • Français
  • United Kingdom (English)

Asia Pacific

  • Australia (English)
  • India (English)
  • New Zealand (English)
  • 中国
    • 简体中文Chinese
    • English
  • 日本Japanese (日本語)
  • 한국Korean (한국어)

Contact your local office

  • Contact sales
  • Trial software

MathWorks

Accelerating the pace of engineering and science

MathWorks is the leading developer of mathematical computing software for engineers and scientists.

Discover…

Explore Products

  • MATLAB
  • Simulink
  • Student Software
  • Hardware Support
  • File Exchange

Try or Buy

  • Downloads
  • Trial Software
  • Contact Sales
  • Pricing and Licensing
  • How to Buy

Learn to Use

  • Documentation
  • Tutorials
  • Examples
  • Videos and Webinars
  • Training

Get Support

  • Installation Help
  • MATLAB Answers
  • Consulting
  • License Center
  • Contact Support

About MathWorks

  • Careers
  • Newsroom
  • Social Mission
  • Customer Stories
  • About MathWorks
  • Select a Web Site United States
  • Trust Center
  • Trademarks
  • Privacy Policy
  • Preventing Piracy
  • Application Status

© 1994-2022 The MathWorks, Inc.

  • Facebook
  • Twitter
  • Instagram
  • YouTube
  • LinkedIn
  • RSS

Join the conversation