Rebasing VS Merging

Goals

• Learn the differences between rebasing and merging.

Discussion

Let’s explore the differences between merging and rebasing. In order to do so, we need to rewind the repository back in time before the first merge, and then redo the same steps, but using rebasing rather than merging.

We will make use the of the reset command to wind the branches back in time.