Is it possible to disable the auto-merge option in Visual Studio Team System 2008? If so how?

by

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”:

enter image description here

Leave a Comment

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)