Chapter 5 Understanding and Using Branches
You can use Git
with a single branch—the default master—and
get all the benefits of a VCS. Git will track the history, let
you collaborate with other developers, and make sure you don’t
accidentally delete something important.
But using Git this way is like buying a racing car and using it for your commute. It will get you there, but you never get to use the car to its potential in the 8 a.m. rush-hour traffic.
Branches are a fundamental part of Git. In this chapter, you’ll learn what branches are and how to do the following:
-
Create new branches
-
Merge changes between branches
-
Handle conflicts
-
Delete branches
-
Rename branches
-
Handle release branches
We’re going to be working with ...