https://medium.com/@developer.olly/what-you-need-to-know-about-git-rebase-and-git-merge-as-a-beginner-3f93a98928d0