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 to extract conflict markers if necessary, compare the differences causing the
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 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.
After you are satisfied with the file that is marked conflicted, you can mark the conflict resolved and commit the file.
Look for conflicted files in the Current Folder browser.
Check the source control status column (SVN or Git) for files with a red warning symbol, which indicates a conflict.
Right-click the conflicted file and select Source Control > View Conflicts to compare versions.
Examine the conflict. A comparison report opens that shows the differences between 