Chapter 5. Advanced branching

This chapter covers

  • Configuring git merge’s behavior
  • Resolving merge conflicts
  • Avoiding having to solve the same merge conflicts multiple times
  • Creating a tag
  • Generating a version number from previous tags
  • Bringing individual commits from one branch to another
  • Reverting a previous commit
  • Listing what branches contain a given commit

When working as part of a team on a software project, you’ll typically use branches to separate work between individuals, features, bug fixes, and software releases. You should already be able to perform some basic branching actions, such as creating, deleting, and merging a branch. This chapter will expand on those so you can improve your branching workflow to be more effective. ...

Get Git in Practice now with O’Reilly online learning.

O’Reilly members experience live online training, plus books, videos, and digital content from 200+ publishers.