https://www.derekgourlay.com/blog/git-when-to-merge-vs-when-to-rebase/
https://git-scm.com/book/en/v2/Git-Branching-Rebasing
https://www.atlassian.com/git/tutorials/merging-vs-rebasing/
https://www.atlassian.com/git/articles/git-team-workflows-merge-or-rebase/
http://stackoverflow.com/questions/5104649/how-to-abort-an-interactive-rebase-if-abort-doesnt-work