<< 

A merge happens when combining two branches. 
Git will take two (or more) commit pointers 
and attempt to find a common base commit between them.
Git has several different methods to find a base commit, 
these methods are called "merge strategies". 

>> Source: Atlassian