Advanced Branching Techniques

Chapter 6, Collaborative Development with Git, described how to arrange teamwork while focusing on repository-level interactions. In that chapter, you learned about various centralized and distributed workflows, as well as their advantages and disadvantages.

This chapter will dive deeper into the details of collaboration in distributed development. We’ll explore the relationships between local branches and branches in remote repositories. Then, we’ll introduce the concept of remote-tracking branches, branch tracking, and upstream. This chapter will also teach us how to specify the synchronization of branches between repositories by using refspecs and push modes.

You will also learn branching techniques: how branches can be used to create new features, prepare new releases, and fix bugs. You will learn about the advantages and disadvantages of different branching patterns. Among other things, this chapter will show you how to use branches...