git — Rebase vs Merge

https://hackernoon.com/git-merge-vs-rebase-whats-the-diff-76413c117333
  • When you do rebase a feature branch onto master, you move the base of the feature branch to master branch’s ending point.
  • Merging takes the contents of the feature branch and integrates it with the master branch. As a result, only the master branch is changed. The feature branch history remains same.
  • Merging adds a new commit to your history.
http://www.orbitale.io/2015/12/28/git-difference-between-merge-and-rebase.html

--

--

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store