MATLAB Programming Fundamentals - MathWorks

(^3) Close the Branches dialog box and work on the files on your branch.
If the branch merge causes a conflict that Git cannot resolve automatically, an error
dialog box reports that automatic merge failed. Resolve the conflicts before proceeding.
CautionDo not move or delete files outside of MATLAB because this can cause errors on
merge.
Keep Your Version
(^1) To keep your version of the file, right-click the file and select Mark Conflict
Resolved.
(^2) Click Commit Modified Files to commit your change that marks the conflict
resolved.
View Conflicts in Branch Versions
If you merge a branch and there is a conflict in a file, Git marks the file as conflicted and
does not modify the contents. Right-click the file and select Source Control > View
Conflicts. A comparison report opens that shows the differences between the file on your
branch and the branch you want to merge into. Decide how to resolve the conflict. See
“Resolve Source Control Conflicts” on page 32-11.
Revert to Head
(^1) From within your Git repository folder, right-click the white space of the Current
Folder browser and select Source Control > Branches.
(^2) In the Branches dialog box, click Revert to Head to remove all local changes.
Delete Branches
(^1) In the Branches dialog box under Branch Browser, expand the Branches drop-
down list, and select the branch you want to delete.
(^2) On the far right, click the down arrow and select Delete Branch.
CautionYou cannot undo branch deletion.
Branch and Merge with Git