Replay changes from one branch onto another branch to preserve a linear history. In Git, there are two main ways to integrate changes from one branch into another - the ‘merge’ and the ‘rebase’. In this section we will learn what ‘rebasing’ is, how to do it and in what cases it may not be a good idea to. the basic rebase If we go back to an earlier example from the Merge chapter, we can see that w