Was this page helpful?
Your feedback about this content is important. Let us know what you think.
Additional feedback?
1500 characters remaining
Export (0) Print
Expand All
Important This document may not represent best practices for current development, links to downloads and other resources may no longer be valid. Current recommended version can be found here.

Branching and Merging Team Foundation Source Control

This section describes how to branch Team Foundation source control trees and how to merge source-controlled items.

In This Section

Understanding Branching

Describes branching a Team Foundation source control tree.

How to: Branch Files and Folders

Explains the procedure used to branch files and folders using Team Foundation source control.

Understanding Merging

Describes merging files and folders in Team Foundation source control.

How to: Merge Files and Folders

Explains the procedure used to merge files and folders using Team Foundation source 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

Related Sections

Comparing Files in Source Control

Explains how to compare or diff files, folders, and shelvesets.

Resolving Conflicts (Team Foundation Source Control)

Lists topics on resolving merge, check-in, and get conflicts.

Team Foundation Source Control Walkthroughs

Lists walkthroughs which explore using source control, customizing a source control check in, and using source control from the command line.

See Also

Community Additions

ADD
Show:
© 2015 Microsoft