清空筛选条件
清空筛选条件

"View Conflicts" for Simulink Models is broken during rebase operations

12 次查看（过去 30 天）
steve l
steve l 2022-1-23
If I make changes to a Simulink model in my branch and then rebase onto another branch that also made changes to the same Simulink model, I get a merge conflict. If I go to MATLAB and right click the file and go to Source Control -> View Conflicts, the 3 way merge tool picks up the wrong base/local/remote and so it's not very useful. The "base" is actually the branch I'm trying to rebase onto, 'theirs' is the branch I was on, and 'mine' looks like the branch I'm trying to rebase onto again.
I've found a workaround by using git mergetool to create BASE, LOCAL, REMOTE, and BACKUP files and then calling slxmlcomp.slMerge with (model_base, model_remote, model_local, model), but I wonder if MATLAB might get an update where it could recognize that a rebase is happening and apply the correct local/base/remote?

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

回答（0 个）

类别

在 Help Center 和 File Exchange 中查找有关 Create Large-Scale Model Components 的更多信息

标签

产品


版本

R2021a

Community Treasure Hunt

Find the treasures in MATLAB Central and discover how the community can help you!

Start Hunting!

Translated by