rebase

A simple explanation of how merge and rebase work along with some use cases to help you choose the best approach.