Merging vs. Rebasing | Atlassian Git Tutorial

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