Supress Merge / Conflict在“获取最新版本”中的项目中有几个文件，或者在Project中但在TFS中没有

Question

I would like to Supress the Merge/Conflict checking for a few source files in a project on Get Latest Version. This is because these source files are autogenerated by a pre-build step. I just want them to be either left with 'local copy' or overwritten by the server version, because they're replace before building anyway and it doesn't matter.

When somebody on my team does a Get Latest Version, of course, these they get merge conflict errors, which isn't a big deal, but since the team changes from time to time, I get emails for a few weeks from new team members saying 'Am I going to lose my changes if I overwrite', until they finally remember to look at the filename.

Which of course caused a dev to get lazy once and ignore a merge warning, on a real source file ... and lose his changes!

Is there any way to tell TFS not to worry about this ... or, better yet, since the pre-build step always creates new versions of these files, just have them in the project (they're needed for building) but not in TFS?

Answer 1

You can always remove the binding of that file, so that it's not added to SourceControl.

1. Select the file in your solution.

2. In Visual Studio, File -> Source Control -> Exclude file from source control

The file will be part of your project but wont be under sourcecontrol. Basically it adds an entry to the ".vspscc" file to ignore the particular file.

Example from Vs2008 solution file.

Edit by OP

• Note, as stated, this is not on the right-click of the file in project explorer!
• Visual Studio 2012 has it hidden a bit better then vs 2008: