After we created different branches, we need
git merge to merge the current branch into the other branch.
(master branch)$ git merge feature_a
It’s result is a recursive merge. That happens when we merge 2 branches that has a different commits history.
Afterwards, we may checkout the
feature_a branch and merge to
$ git checkout feature_a $ git merge master
It’s result is a fast-forward merge. That happens when we merge branches that is in the same timeline.