How and when do I merge or rebase?

Answering one of the most frequently asked questions, Gary and Trisha show how to perform a merge and a rebase, show the differences between these ...