Book Image

Microsoft Team Foundation Server 2015 Cookbook

By : Tarun Arora
Book Image

Microsoft Team Foundation Server 2015 Cookbook

By: Tarun Arora

Overview of this book

Team Foundation Server (TFS) allows you to manage code repositories, build processes, test infrastructure, and deploy labs. TFS supports your team, enabling you to connect, collaborate, and deliver on time. Microsoft's approach to Application Lifecycle Management (ALM) provides a flexible and agile environment that adapts to the needs of your team, removes barriers between roles, and streamlines processes. The book introduces you to creating and setting up team projects for scrum teams. You'll explore various source control repositories, branching, and merging activities, along with a demonstration of how to embed quality into every code check-in. Then, you'll discover agile project planning and management tools. Later, emphasis is given to the testing and release management features of TFS which facilitate the automation of the release pipeline in order to create potentially shippable increments. By the end of the book, you'll have learned to extend and customize TFS plugins to incorporate them into other platforms and enable teams to manage the software lifecycle effectively.
Table of Contents (16 chapters)
Microsoft Team Foundation Server 2015 Cookbook
Credits
About the Author
Acknowledgments
About the Reviewers
www.PacktPub.com
Preface
Index

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.

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 create a branch for each new feature they are coding, sometimes on a daily basis. Git allows you to quickly switch from one branch to another to pivot among different variations of your codebase. When using Git, you can create branches that exist only on your Dev machine and share them if and when you're ready. Consider evaluating your source...