One of the 25 questions in this topic
It does not create an extra merge commit because the history stays linear.