merge

Git Essentials: Create, merge, and distribute code with Git, the most powerful and flexible versioning system available

Ferdinando Santacroce