Merging Branches [Learn Git Video Course]

Learn how to integrate changes from one branch into another branch in Git. This video is part of our free 24-part video course on Learning Git on the Command Line.
Subscribe ► https://www.youtube.com/channel/UCrl5xG-L4ZCFkR-bhUy9BVg?sub_confirmation=1

***************************************

Additional Git tutorials and resources

Learn Git on the Command Line: a free 24-part video course ► https://www.youtube.com/watch?v=M-O8ZNW9icQ&list=PLyCj4RCToz5DRDx3sJ4iW9i8D2G8OdHYH

Learn Git with Tower: https://www.youtube.com/playlist?list=PLyCj4RCToz5BEcpZgwLfAhzxVRlDY3z-O

Surviving with Git: https://www.youtube.com/playlist?list=PLyCj4RCToz5AKiAKycmAZcTZron_yANQT

More Productive in Git with Tower: https://www.youtube.com/playlist?list=PLyCj4RCToz5A_1RzK7MfNHSQr65FxmSGR

***************************************

Welcome to our video series on learning version control with Git. This video will teach you how to integrate changes from one branch into another branch.

We'll take this as our starting situation: We've worked hard and made a couple of commits on our signup feature branch. In the meantime, the main project has moved on with other changes. We now want to integrate our changes from the signup branch back into the master branch. The "merge" command does exactly this.

In practice, merge only involves two steps for us. First, we have to make sure we're on the right branch - because it's always the current HEAD branch that receives new changes. The second step is just to call the "merge" command. Here, we let Git know which branch we want to integrate into our current HEAD.

Let's do all of this in practice.

Let's see where we are: with "git branch" we take a quick look at our branching situation. And we see that we're still on our feature branch. "git log" reminds us what we want to achieve: we want to integrate this latest commit back into the master branch. Because, using "git log master", we see that this isn't present on the master branch.

So, let's get going. First, we need to switch to the master branch - because, as said before, it's always the current HEAD branch that receives merged changes. With "git checkout master" we make master active.

Then, all we have to do is call git merge with the name of the branch we want to integrate.

If we now look at the master branch's history once more, we see that the changes were successfully integrated and are here, too.

We could now delete the signup feature branch or continue to work and merge again any time later.

SUBSCRIBE to learn more about Git, Tower, and how to become a better developer!
https://www.youtube.com/channel/UCrl5xG-L4ZCFkR-bhUy9BVg?sub_confirmation=1

For more free ebooks, cheat sheets, and video tutorials make sure to check out our FREE learning platform!
https://www.git-tower.com/learn/

STAY UP-TO-DATE:
Tower: https://www.git-tower.com
YouTube: https://www.youtube.com/channel/UCrl5xG-L4ZCFkR-bhUy9BVg?sub_confirmation=1
Twitter: https://twitter.com/gittower
Facebook: https://www.facebook.com/gittower

#git #learngit #gittutorial