One of the 100 questions in this topic
A merge combines the changes from two different branches into one.