Merging in git

Series: Why git?, Basics, Branches, Merging, Remotes

The last video covered how to make branches and simple merges.

This time we look at what to do when you want just one change from another branch (cherry-picking) and how to merge two branches when there are conflicts between them. We also look at rebasing, which is a different way to combine the work done on two branches, which hides complexity from other people at the expense of changing history.

Slides: Merging in git.