https://www.togidev.com/how-to-rebase-in-git-and-fix-common-errors/