Is it possible to disable the auto-merge option in Visual Studio Team System 2008? If so how?
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”: