From the course: Git: Branches, Merges, and Remotes

Unlock the full course today

Join today to access over 22,600 courses taught by industry experts or purchase this course individually.

Merge code

Merge code

From the course: Git: Branches, Merges, and Remotes

Start my 1-month free trial

Merge code

“

- [Instructor] In this chapter, we're going to learn how to merge branches and we're going to start by learning the simple process of merging code from one branch into another. Let's say that we have our master branch and we've been working on it and at some point we decide we want to branch off and we want to work on a new feature called revise navigation. So now we've got a new branch and maybe development has gone on in the master branch in the meantime, but we're working on this revise navigation branch. When we finally have everything just like we like it, and it's gone through code review and we've gotten stakeholder approval, we're ready to merge it back into the master branch so that everyone has access to this new feature we've created. In order to do that, we need to create a merge. This merge will take the code that's in the revise navigation branch and bring it into the master branch. To begin with, let's take a look at our branches. And you can see I'm on the reset branch…

Contents