Understanding Git merge strategies

We will not go deep into all of the possibilities of the git merge command, but we will explain some of the terms used in connection with Git and merging.

Fast-forward merge

When you merge two branches in Git, and one branch is a subset of the commits of the other, the result will be a fast-forward merge, where no merge is done at all. Consider the following diagram:

The branch will reset to a new position.

Squash commit

Using squash commit can help you to keep the branch clean and simple. When you want to merge one branch...