<File> has been merged with no conflicts.  Check in now?

This warning has the following cause and solution:

• This is the standard Merge warning displayed by VSS.

  Click Yes to check the merged file into VSS.

  Click No to not check the merged file into VSS.