Share via

Visual Studio Team System 2010: Source Code Branching and Merging Improvements

  • Article

In this 14-minute video, you'll learn about improvements for multiple people working on one or more phases of a software project simultaneously.

See: https://channel9.msdn.com/shows/10-4/10-4-Episode-4-No-More-Parallel-Development-Pain/

Contents:

3:10 Branch descriptions, relationships to other branches, branch permissions.
3:40 Branch hierarchy visualizations.
4:25 One-click new branch creation.
7:15 New changeset visualizations: history view, parent/child view, and drag/drop merges.
10:00 Line-by-line annotations of what's been happening to my code.
10:40 New merge resolution experience: non-modal tool window, richer merge conflict info.