No options to resolve conflicts in .mlapp file using view conflicts in 2018b on MacBook

Question

Roger Rouse 2023-6-16

0
链接

此问题的直接链接

https://ww2.mathworks.cn/matlabcentral/answers/1983974-no-options-to-resolve-conflicts-in-mlapp-file-using-view-conflicts-in-2018b-on-macbook

回答： Neha 2023-6-28

I'm attempting to merge two branches. There is one .mlapp file in the repo that two developers have worked on. It contains conflicts. I go to source control -> view conflicts. The comparison is displayed in what appears to be HTML without any widgets for accepting or rejecting changes. So I can see the changes but can't do anything about them. Is this a 2018 limitation or Mac version limitation?

Thanks, Roger

0 个评论
显示 -2更早的评论隐藏 -2更早的评论

请先登录，再进行评论。

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

Answer 1

Neha 2023-6-28

0
链接

此回答的直接链接

https://ww2.mathworks.cn/matlabcentral/answers/1983974-no-options-to-resolve-conflicts-in-mlapp-file-using-view-conflicts-in-2018b-on-macbook#answer_1264153

Hi Roger,

I understand that you are not able to resolve conflicts and merge branches for an MLAPP file. This is a known limitation in MATLAB R2020a and earlier versions. Please refer to Git Source Control for MLAPP files for more information.

I hope this helps!