You can use the Comparison Tool to merge changes between revisions, as described
in “Merge Text Files” on page 32-12.(^6) When you have resolved the changes and want to commit the version in your
sandbox, in the Current Folder browser, right-click the file and select Source
Control > Mark Conflict Resolved.
With Git, the Branch status in the Source Control Details dialog box changes from
MERGING to SAFE.
(^7) Commit the modified files.
Merge Text Files
When comparing text files, you can merge changes from one file to the other. Merging
changes is useful when resolving conflicts between different versions of files.
If you see conflict markers in a text comparison report like this:
<<<<<<< .mine
then extract the conflict markers before merging, as described in “Extract Conflict
Markers” on page 32-13.
TipWhen comparing a file to another version in source control, by default the right file is
the version in your sandbox and the left file is either a temporary copy of the previous
version or another version causing a conflict (e.g., filename_theirs). You can swap the
position of the files, so be sure to observe the file paths of the left and right file at the top
of the comparison report. Merge differences from the temporary copy to the version in
your sandbox to resolve conflicts.
(^1) In the Comparison Tool report, select a difference in the report and click Merge. The
selected difference is copied from the left file to the right file.
Merged differences display gray row highlighting and a green merge arrow.
The merged file name at the top of the report displays with an asterisk
(filename.m*) to show you that the file contains unsaved changes.
32 Source Control Interface