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 check out the branch you want to update:

git checkout my-branch

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

git merge another-branch

Lessons in this unit:

0:	Introduction
1:	Working with Remotes
2:	Squashing Commits
3:	Rebase vs Merge
4:	Git Bisect for Debugging
5:	Git Worktrees
6:	Git Submodules
7:	Understanding Detached HEAD
8:	Managing Secrets in Git
9:	Git Workflows and Best Practices
10:	How to push to 2 repositories at the same time and keep them in sync
11:	▶︎ How to update a Git branch from another branch
12:	Git, detached HEAD
13:	Trigger deploys on Netlify with submodules
14:	A Git Cheat Sheet
15:	Git, squashing vs not squashing
16:	An incomplete list of great Git tutorials
17:	Git, what if you forgot to add a file to a commit?
18:	Git workflow to manage work on multiple branches
19:	How to set up the Git SSH keys