MATLAB Programming Fundamentals - MathWorks

Action Procedure

Resolve conflicts. If you and another user change the same file in different

sandboxes or on different branches, a conflict message

appears when you try to commit your modified files.

Extract conflict markers if necessary, compare the

differences causing the conflict, and resolve the conflict.

Look for conflicted files in the Files > Modified view.

Identify conflicted folder contents using the source control

summary status. Folders display the rolled-up source

control status. This makes it easier to locate changes in

files, particularly conflicted files. You can hover over the

source control status for a folder to view a tooltip

displaying how many files inside are modified, conflicted,

added, and deleted.

TipUse the List layout to view files without needing to

expand folders.

Check the source control status column (Git or SVN) for

files with a red warning symbol, which indicates a conflict.

Right-click the conflicted file and select View Conflicts to

compare versions. A comparison report opens showing the

differences between the conflicted files.

When you have resolved the changes and want to commit

the version in your sandbox, right-click the file and select

Source Control > Mark Conflict Resolved.

For Git, the Branch status in the Git pane changes from

MERGING to SAFE.

Select the Files > Modified view to check changes.

Revert Changes

This table shows how to revert changes in project files. For more information about

reverting changes, see “Revert Changes in Source Control” on page 32-16.

31 Projects