Git: Two ways to merge changes to the base branch from the feature branch

Image credit: https://pixabay.com/

In this video tutorial, I'll explain 2 ways to merge changes to the base branch from the feature branch.

Let's learn together 2 ways to merge the changes to the base branch from the feature branch.

1. Normal merge and
2. Using the --squash option to squashing multiple commits into a single commit.

And let's also learn 2 strategies used by git to merge the changes based on the base branch changes.

1. Fast-Forward strategy and
2. 3-way merge strategy

Please leave comments if you want me to cover a specific topic in the next tutorial.