MATLAB Programming Fundamentals - MathWorks

To view the conflict markers, in the Conflict Markers Found dialog box, click Load File.

Do not try to load files, because MATLAB does not recognize conflict markers. Instead,

click Fix File to extract the conflict markers.

MATLAB checks only conflicted files for conflict markers.

Extract Conflict Markers

When you open a conflicted file or select View Conflicts, MATLAB checks files for conflict

markers and offers to extract the conflict markers. MATLAB checks only conflicted files

for conflict markers.

However, some files that are not marked as conflicted can still contain conflict markers.

This can happen if you or another user marked a conflict resolved without removing the

conflict markers and then committed the file. If you see conflict markers in a file that is

not marked conflicted, you can extract the conflict markers.

(^1) In the Current Folder browser, right-click the file, and select Source Control >
Extract Conflict Markers to File.
(^2) In the Extract Conflict Markers to File dialog box, leave the default option to copy
“mine” file version over the conflicted file. Leave the Compare extracted files check
box selected. Click Extract.
(^3) Use the Comparison Tool report as usual to continue to resolve the conflict.
32 Source Control Interface