Is it possible to disable the auto-merge option in Visual Studio Team System 2008? If so how?
I'd like to disable the automatic merge feature when checking in a file to TFS that another developer has worked on so that I always need to merge manually. Is there any way to do this? Andrey Try do the following (working in all Visual Studio versions from 2012-onwards): Tools -> Options -> Source Control -> Visual Studio Team Foundation Server -> Uncheck "Attempt to automatically resolve conflicts when they are generated": The short answer as of Visual Studio 2008 seems to be no. Whenever two people have changed the same file, you have to "merge" the code. This can take three forms: Keep