Merge Strategies

Explicit Merge (a.k.a. non fast-forward)

Creates a new merge commit. (this will happen if you use --no-ff)

Fast Forward Merge

Forward rapidly. Does not create a new commit.

Rebase

Integrates changes from one branch into another by changing the base of your current branch.
Creates a linear commit history.

Squash

Combines all commits from a branch into a single commit when merging into the main branch.

`--no-ff` Option

--no-ff option ensures that a fast forward merge will not happen.
A new commit object will always be created.
Good if you want git to maintain a history of feature branches.