SimMerge is the industry-standard Simulink diff/merge tool, and supports both two- and three-way merge 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.
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.
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.
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)
See SimMerge in action. Click here for a flash demo.
To request a trial click here
For more information on how to request a quote or place an order click here.
Download SimMerge documentation:
To learn more about SimMerge, or any of our other tools, contact us:
+1 (515) 296-3253
contactus@ensoftcorp.com
For full contact information, click here.