When there are Conflicted manual merge shown in the 3 way merge tool how to see where are the conflicts in the model

8 views (last 30 days)
From documentation : "Tool cannot perform the change. The user must make the change manually in the Simulink Editor.
(Option buttons do not appear in row.)" - the tool does not show these conflicts in the list, how can we then see where the conflicts are in the model ?

Accepted Answer

Sandesh
Sandesh on 22 Oct 2025 at 17:26
Moved: madhan ravi on 23 Oct 2025 at 13:18
Found out that I had to click on show button at the top (I selected non functional changes and other buttons ) and then click through the arrow at the top left to take me to the line in the list that had conflicted manual merge issue, most of these were to do with zorder which I was happy to accept as resolved without actually changing the model.

More Answers (0)

Categories

Find more on Interactive Model Editing in Help Center and File Exchange

Products


Release

R2024a

Community Treasure Hunt

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

Start Hunting!