File has been merged with no conflicts.
You're merging a set of files. This dialog box is displayed when the first file has been successfully merged. You can choose to:
-
Continue to merge the remainder of the files (without showing this dialog box again).
-
Save the merged file.
-
Check in the merge file.
-
Cancel the merge operation.
For more information, see Working with Multiple Developers.