O'Reilly logo

Microsoft Team Foundation Server 2015 Cookbook by Tarun Arora

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

Performing a baseless merge between sibling branches in TFVC

Managing source code can get challenging when multiple Teams are contributing to the same repository. Are you already familiar with the branching and merging tools available in TFS? If not, I would encourage you to go through the ALM Rangers Version Control Guidance http://bit.ly/1He8pmL. The guidance talks in detail about the various branching strategy and its pros and cons.

Performing a baseless merge between sibling branches in TFVC

An extract from the ALM Rangers Version Control Guide showing different branching strategies

Branching in TFVC can get complicated over time; branching in Git is lightweight and path independent. In Git, many developers ...

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required