Enable team development of Simulink Models
SimMerge is a two- and three-way merge tool for Simulink models. SimMerge’s three-way merge is the easiest and most reliable way to integrate changes from different team members into a single Simulink model. Click here for a flash demo.
SimMerge integrates with your repository to enable parallel development of Simulink models with the same flexibility you enjoy with source code. SimMerge performs a two or three-way diff between your local model and the models in the repository. You can then browse differences, automatically merge non-conflicting changes, and manually merge other changes.
Flexible
Use SimMerge to merge Simulink, Stateflow, and TargetLink models.
VCS Integration
SimMerge works out-of-the-box with most version control systems, including ClearCase and Subversion.
Fast and Accurate
Merge models much faster than by manual inspection and editing.
Reduce Time Between Merges
Keep all team members up-to-date, by frequently merging changes.
View Differences Graphically
View differences to be merged as highlighted blocks right within Simulink.
About Merging*
Two-way merge
A two-way merge performs an automated difference analysis between a file 'A' and a file 'B'. This method considers the differences between the two files alone to conduct the merge and makes a "best-guess" analysis to generate the resulting merge.
Three-way merge
A three-way merge is performed after an automated difference analysis between a file 'A' and a file 'B', while also considering the origin, or parent, of both files. This merge is the most reliable and has performed well in practice. It also requires the least amount of user intervention.
Trends
The availability of high-quality three-way merge tools has led to the increase in popularity of concurrent modification. Even smaller software groups can benefit from concurrent modification.
* Summarized from http://en.wikipedia.org/wiki/Merge_(revision_control)