EnSoft Corp. : SimMerge LT : Overview

Enable team development of Simulink Models

SimMerge LT is based on the industry-standard Simulink diff/merge tool for Simulink models. SimMerge LT’s two-way merge is an easy, 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-way diff between two models. You can then browse differences and easily merge changes.

Flexible

Use SimMerge to merge Simulink, Stateflow, and TargetLink models.

Version Control System 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 (SimMerge LT and SimMerge Pro)

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 (SimMerge Pro only)

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)

主な機能