merge vs. rebase
Rebasing can be incorporated into your existing Git workflow as much or as little as your team is comfortable with. In this section, we'll take a look at the benefits that rebasing can offer at the various stages of a feature's development.
The first step in any workflow that leverages git rebase is to create a dedicated branch for each feature. This gives you the necessary branch structure to safely utilize rebasing: