Skip to Main Content
Pragmatic Version Control Using Git
book

Pragmatic Version Control Using Git

by Travis Swicegood
December 2008
Intermediate to advanced content levelIntermediate to advanced
184 pages
4h 47m
English
Pragmatic Bookshelf
Content preview from Pragmatic Version Control Using Git

1.8 Merging

In our Choose Your Own Adventure story, Joe’s path when we met him had two distinct routes: into the cave or out of the forest. Often, the plot lines would come back together later in the book, though.

He might start off going through the cave but end up on the banks of the same river that flowed alongside the forest that he left. Sometimes the author runs out of places to send our hero Joe, so he has to go down the same path but get there multiple ways.

Likewise, having a couple—or even dozens—of branches is OK, but their paths will sometimes need to come together. This is where merging comes in.

Merging is taking two or more branches and combining their history into one. Git goes about merging the same way you might. It compares ...

Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Start your free trial

You might also like

Git: Mastering Version Control

Git: Mastering Version Control

Ferdinando Santacroce, Aske Olsson, Rasmus Voss, Jakub Narębski
Pragmatic Guide to Git

Pragmatic Guide to Git

Travis Swicegood
Git Version Control Cookbook - Second Edition

Git Version Control Cookbook - Second Edition

Kenneth Geisshirt, Emanuele Zattin(EUR), Aske Olsson, Rasmus Voss

Publisher Resources

ISBN: 9781680500189Errata Page