Git Merge – The Definitive Guide

Learn how to merge Git branches using the three-way merge algorithm.
Git first locates the merge base and calculates the differences between the two branches. It then applies those differences to the merge base using the merge algorithm and creates a new merge commit. Conflict resolution can be done automatically or manually using a graphical user interface or the command line.