Resolve Source Control Conflicts
Examining and Resolving 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. Follow
the procedure “Resolve Conflicts” on page 32-11 to extract conflict markers if necessary,
compare the differences causing the conflict, and resolve the conflict.To resolve conflicts you can:- Use the Comparison Tool to merge changes between revisions.
- Decide to overwrite one set of changes with the other.
- Make changes manually by editing files.
For details on using the Comparison Tool to merge changes, see “Merge Text Files” on
page 32-12.After you are satisfied with the file that is marked conflicted, you can mark the conflict
resolved and commit the file.Resolve Conflicts
(^1) Look for conflicted files in the Current Folder browser.
2 Check the source control status column (SVN or Git) for files with a red warning
symbol , which indicates a conflict.
(^3) Right-click the conflicted file and select Source Control > View Conflicts to
compare versions.
(^4) Examine the conflict. A comparison report opens that shows the differences between
the conflicted files.
With SVN, the comparison shows the differences between the file and the version of
the file in conflict.
With Git, the comparison shows the differences between the file on your branch and
the branch you want to merge into.
(^5) Use the Comparison Tool report to determine how to resolve the conflict.
Resolve Source Control Conflicts