automerge

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? ...

How can I merge my files when the folder structure has changed

I want to perform a major codebase reorganization, but I'm unable to proceed unless I can provide a way for trunk fixes to be easily applied to branches that were taken before the reorganization. One approach I was considering was to apply the reorganization to to all of the support branches, but this is potentially destabilising. A pr...