Does anybody know how to have real "merge" action between two .mdl files? Specifically if you are using subversion version control how can we handle a .mdl file share between two users? Thanks
Best Answer
There is a third-party application known as SimMerge (<http://www.ensoftcorp.com/SimMerge/Overview.gen.html>) that is quite helpful for this. (I'm a user, not affiliated with the company.) It's a bit expensive, but well worth the cost if working on a team. It supports two- and three-way diff and merging as you would expect with any other source code management tool.
I have used subversion with Tortoise SVN quite successfully. I tend to perform the check-in/check-out actions outside of MATLAB and Simulink. I know other people have used CVS and Perforce as well.
The SLX file format can be considered a binary file and could be treated in GIT as any other binary file, i.e. it cannot be diff'd with a traditional text comparison tool.
Best Answer