How do I merge two linkage files for simulink requirements?

Question

Karolin Repp 2021-4-16

0
链接

此问题的直接链接

https://ww2.mathworks.cn/matlabcentral/answers/803956-how-do-i-merge-two-linkage-files-for-simulink-requirements

评论： Karolin Repp 2021-4-19

We are currently working with multiple people at our simulink model. For this model we have exported a bunch auf different requirements and now want to link them to our mode and since we are multiple people we are working with git. Now a problem occures if two or more people have linked different requirements to the same model (i.e. Req#1 and Req#2 are linked to model.mdl and therefore the links are saved in model.slmx) and after the first person pushes this to the master, the second gets an merging conflict regarding the model.slmx but we have no idea how to solve it because the "View conflict" option of the git integration of matlab does not help at this place and the model.slmx has such a form that other git tools cannot read it.

Does anyone knows who to solve this problem and merge the two model.slmx files without just using one and rework all links from the second one?