Let's start by the following example:
[![enter image description here][1]][1]
Now we have 3 options to merge changes of feature branch into master branch:
- Merge commits
Will keep all commits history of the feature branch and move them into the master branch
Will add extra dummy commit.