O'Reilly logo

Version Control with Git and GitHub by Joseph Muli, Alex Magana

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

Branches

Learning Objectives

By the end of this chapter, you will be able to:

  • Explain the feature-branch workflow
  • Create, navigate, and delete branches
  • Manage changes in the working directory
  • Merge changes through pull requests
  • Identify and resolve issues with pull requests

This chapter describes the working of branches, workflows and conflict resolution.

Introduction

In the previous chapter, we explored how local repositories are able to connect to a remotely hosted repository. We covered the git push, git fetch, and git pull commands, which facilitate the retrieval of changes and uploading of changes to the shared repository. Lastly, we explored the git revert and git reset commands, which rescind changes.

In this chapter, we'll ...

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required