Git Rebase vs. Merge

  • git rebase docs – https://git-scm.com/docs/git-rebase
  • git merge docs – https://git-scm.com/docs/git-merge
  • git rebase (GitHub) – https://help.github.com/articles/about-git-rebase/
    • Warning: Because changing your commit history can make things difficult for everyone else using the repository, it’s considered bad practice to rebase commits when you’ve already pushed to a repository. To learn how to safely rebase on GitHub, see “About pull request merges.”
  • branching and rebasing (Git book) – https://git-scm.com/book/en/v2/Git-Branching-Rebasing
    • The Perils of Rebaseing – https://git-scm.com/book/en/v2/Git-Branching-Rebasing#_rebase_peril
    • Do not rebase commits that exist outside your repository.

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

GitHub Flow: https://guides.github.com/introduction/flow/