No options to resolve conflicts in .mlapp file using view conflicts in 2018b on MacBook
조회 수: 4 (최근 30일)
이전 댓글 표시
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
채택된 답변
Neha
2023년 6월 28일
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!
댓글 수: 0
추가 답변 (0개)
참고 항목
카테고리
Help Center 및 File Exchange에서 Seismology에 대해 자세히 알아보기
Community Treasure Hunt
Find the treasures in MATLAB Central and discover how the community can help you!
Start Hunting!