The file in SharePoint conflicts with the file in the source control repository. Rename your file to another file name, then ...