Book Image

Git Version Control Cookbook

By : Aske Olsson, Rasmus Voss
Book Image

Git Version Control Cookbook

By: Aske Olsson, Rasmus Voss

Overview of this book

Table of Contents (19 chapters)
Git Version Control Cookbook
Credits
About the Authors
About the Reviewers
www.PacktPub.com
Preface
Index

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