How to update a Git branch from another branch

Just a few weeks until the 2021 JavaScript Full-Stack Bootcamp opens.
Signup to the waiting list!

I was working on a Git branch that was not up to date with changes I was doing on another branch.

So, I had to incorporate those changes. Given a Git branch that’s not up to date with another branch, how do you merge the changes?

You checkout the branch you want to update:

git checkout my-branch

and you merge from the branch you want to update from:

git merge another-branch

This will create a merge commit, which will include all the differences between the 2 branches - in a single commit.

Also check my Git guide.

The 2021 JavaScript Full-Stack Bootcamp will start at the end of March 2021. Don't miss this opportunity, signup to the waiting list!

Given a Git branch that's not up to date with another branch, how do you merge the changes?