An automatic merge has occurred and there are conflicts. Edit <File> to resolve them

See Also

Changes you made to the file since you checked it out conflict with other changes made (and checked in) to the source file by another user. This error has the following cause and solution:

• You have to resolve the conflicts between your changes to a file and another user's changes before you can check in the file.

  Open the file in your working folder and search for six consecutive equal signs (======). VSS uses these to mark the location of a conflict.

You may prefer to use the Visual Merge feature to make conflict resolution easier. To avoid this situation, your VSS Administrator can disable multiple check outs in your project.