A Quick Reminder on the Difference Between Git Merge and Rebase

https://www.atlassian.com/git/tutorials/merging-vs-rebasing