Chapter 3. Branching, Merging, and Options
In this chapter, we will cover the following recipes:
- Managing your local branches
- Branches with remotes
- Forcing a merge commit
- Using git rerere to merge Git conflicts
- The difference between branches
In this chapter, we will cover the following recipes: