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.
Pssst! Also check my latest YouTube video
I am writing a book on how to create a successful blog as a developer.
It will be released late February.
Signup to my newsletter to get 2/3 free chapters in your inbox in the next few weeks!