Branching and Merging Team Foundation Version Control
This section describes how to branch Team Foundation version control trees and how to merge version-controlled items.
In This Section
Understanding Branching
Describes branching a Team Foundation version control tree.How to: Branch Files and Folders
Explains the procedure used to branch files and folders using Team Foundation version control.Understanding Merging
Describes merging files and folders in Team Foundation version control.How to: Merge Files and Folders
Explains the procedure used to merge files and folders using Team Foundation version control.How to: Associate a File Type with a Merge Tool
Describes the steps used to specify the file type extensions associated with merging.
Reference
Team Foundation Version Control Command-Line Reference
Related Sections
Comparing Folders and Files in Version Control
Explains how to compare or diff files, folders, and shelvesets.Resolving Folder Differences and File Conflicts (Team Foundation Version Control)
Lists topics on resolving merge, check-in, and get conflicts.Team Foundation Version Control Walkthroughs
Lists walkthroughs which explore using version control, customizing a version control check in, and using version control from the command line.
See Also
Tasks
Walkthrough: Advanced Functionality of Version Control
How to: View Version Control File and Folder Properties