Git with Matlab | R2019a .gitattributes and merge conflict resolution with Matlab mlmerge

Matlab R2019a used here

Setting up git to work with Matlab Simulink models by configuring a .gitattributes file to treat .slx files as binary files. Contrived merge conflict created using a simple Simulink model which is resolved using Matlab's graphical merge tool for Simulink models.

 Lines to add to .gitattributes for Matlab files
*.mlx -crlf -diff -merge
*.mat -crlf -diff -merge
*.fig -crlf -diff -merge
*.mdl -crlf -diff -merge
*.slx -crlf -diff -merge
*.mlapp -crlf -diff -merge
*.p -crlf -diff -merge
*.mdlp -crlf -diff -merge
*.slxp -crlf -diff -merge
*.sldd -crlf -diff -merge
*.slxc -crlf -diff -merge
*.mlproj -crlf -diff -merge
*.mldatx -crlf -diff -merge
*.slreqx -crlf -diff -merge
*.sfx -crlf -diff -merge
*.sltx -crlf -diff -merge

References: