I am working on an application that is written in VB6 and uses a lot of new VB .NET components. Visual Studio 6 only checks out files exclusively when working integrated with TFS. To get around that my team and I use the Team Explorer window in Visual Studio 2008 to check VB6 files in and out.
We quickly discovered that checking files in via Team Explorer does not check for changes on the server. A quick example would be 2 developers check out a single file using Team Explorer. Both make modifications, developer 1 checks in their changes first and then developer 2 checks their changes. I would expect TFS to prompt for a code merge. Instead it commits the changes from developer 2 and overwrites the changes from developer 1.
This stopped occurring once the Beyond Compare 3 plug-in was removed. Anyone else have this issue? Is there some additional configuration that I must perform?
We quickly discovered that checking files in via Team Explorer does not check for changes on the server. A quick example would be 2 developers check out a single file using Team Explorer. Both make modifications, developer 1 checks in their changes first and then developer 2 checks their changes. I would expect TFS to prompt for a code merge. Instead it commits the changes from developer 2 and overwrites the changes from developer 1.
This stopped occurring once the Beyond Compare 3 plug-in was removed. Anyone else have this issue? Is there some additional configuration that I must perform?
Comment