Skip to main content
Get started for free
Visual Studio Developer Center > Home > Visual Studio > How Do I Videos for Visual Studio 2010 > Using and Managing Team Foundation Server > Resolve Conflicts Between Two Files using Visual Studio 2010

How Do I: Resolve Conflicts Between Two Files using Visual Studio 2010?

Rate:  
Views: 468
#
#
#
#
#
About This Video
This video demonstrates how to resolve the conflicts identified by Team Foundation version control during the merge, check-in pending change, or get operations. The sample demonstrates how to resolve the conflicts occurred due to checking-in the new versions of file.

Presented By: Advaiya Inc.
Length: 05 minutes 29 seconds


Tags:

Downloads

Video: WMV | MP4 | WMV (ZIP) | PSP | 3GP | iPod | Zune
Audio: AAC | WMA | MP3 | MP4

Related Videos

How do I: Use IntelliTrace in Visual Studio 2010? Views:4812 How do I: Use IntelliTrace in Visual Studio 2010?
How Do I: Enable Symbol and Source Server Support in Team Foundation Server Build 2010? Views:775 How Do I: Enable Symbol and Source Server Support in Team Foundation Server Build 2010?
How Do I: Get Started with Test Cases in Visual Studio Test Professional 2010? Views:2932 How Do I: Get Started with Test Cases in Visual Studio Test Professional 2010?
How Do I: Use Build in Visual Studio 2010? Views:713 How Do I: Use Build in Visual Studio 2010?
How Do I: Create Custom Check-in Policies in Team Foundation Server 2010? Views:1086 How Do I: Create Custom Check-in Policies in Team Foundation Server 2010?
How Do I: Use Traceability in Visual Studio 2010? Views:965 How Do I: Use Traceability in Visual Studio 2010?

Additional Resources