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

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

Answer 1

[Neha]

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!