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
Introduction
If you are developing a small application in a big corporation as a developer, or you are trying to wrap your head around an open source project from GitHub, you have already been using branches with Git.
Most of the time, you may just be working on a local develop or master branch and didn't care so much about other branches.
In this chapter, we will show you different branch types and how to work with them.
Get Git: Mastering Version Control now with the O’Reilly learning platform.
O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.
