MATLAB Answers

Track Simulink slx Files

4 views (last 30 days)
Wei Yang Shen
Wei Yang Shen on 25 Oct 2020
Commented: Wei Yang Shen on 28 Oct 2020
Is there a way to track simulink files with Git? From the set up page, it suggested to add slx files to gitattributes as a binary to prevent git from potentially corrupting the file contents. The issue is that now merging is a pain because the gitattributes will not make merge attempts which means I have to go download the changes to a new location and open that simulink file and manually compare and then copy the new simulink file in to resolve the conflicts. Is there another way to do this?

  0 Comments

Sign in to comment.

Answers (2)

Fangjun Jiang
Fangjun Jiang on 26 Oct 2020
Simulink .slx file IS binary format so you really don't have a choice. Previous .mdl file is textual but it is not wise to rely on any textual diff tool to do the diff and merge.
Use the built-in Simulink diff capability to track changes and do the merge, although its performance is somethat not ideal.

  1 Comment

Wei Yang Shen
Wei Yang Shen on 27 Oct 2020
So basically if I want to rebase to squash or rename etc, I have to do it via Simulink itself instead of via terminal?

Sign in to comment.


Steven Lord
Steven Lord on 27 Oct 2020
This documentation page includes instructions on how to configure source control tools to use tools provided by MathWorks to diff, merge, and automerge MathWorks file formats. It specifically shows the workflow for Git and SVN.

  1 Comment

Wei Yang Shen
Wei Yang Shen on 28 Oct 2020
But how would this work for making a PR to a remote such as one on github. If someone approves of my PR, the gitattributes will ignore pulling in the changes from the slx file?

Sign in to comment.

Tags

Products

Community Treasure Hunt

Find the treasures in MATLAB Central and discover how the community can help you!

Start Hunting!

Translated by