Merging .mlapp files via SVN

Question

Benno Schumacher 2018-9-6

0
链接

此问题的直接链接

https://ww2.mathworks.cn/matlabcentral/answers/417789-merging-mlapp-files-via-svn

评论： Mark Eigenraam 2022-3-2

Is it possible to merge .mlapp files with svn? I'm using Tortoise SVN and already set the MatLab comparison tool as an external diff using the instrucions specified here. But when I try to update/commit them and there's a new version by another user in the target folder I get an error message by Toroise SVN saying there is a conflict between the two revisions. Resolving the conflict leads me to the MatLab comparison tool in which the merge button is missing. So effectively I am unable to merge the two revisions. Am I doing something wrong?

1 个评论
显示 -1更早的评论隐藏 -1更早的评论

Jim Cornacchio 2018-11-19

Benno, I'm having the same issue, but using Git. I don't believe that we can currently merge .mlapp files, only compare. I read through the documentation carefully after running to the issue and the subtitles are:

Compare and Merge Text

Compare and Merge Live Code

Compare and Merge MAT-Files

Compare Binary Files

I think that the last subtitle is purposefully missing the word "Merge." This is a problem that needs to be fixed....

请先登录，再进行评论。

请先登录，再回答此问题。