No options to resolve conflicts in .mlapp file using view conflicts in 2018b on MacBook
3 visualizzazioni (ultimi 30 giorni)
Mostra commenti meno recenti
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 Commenti
Risposta accettata
Neha
il 28 Giu 2023
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 Commenti
Più risposte (0)
Vedere anche
Categorie
Scopri di più su Source Control in Help Center e File Exchange
Community Treasure Hunt
Find the treasures in MATLAB Central and discover how the community can help you!
Start Hunting!