merge vs. rebase
Merging vs. rebasing
The first thing to understand about
git rebase is that it solves the same problem
git merge. Both of these commands are designed to integrate changes from one
branch into another branch ‐ they just do it in very different ways.
Consider what happens when you start working on a new feature in a dedicated branch,
then another team member updates the
master branch with new commits. This results
in a forked history, which should be familiar to anyone who has used Git as a
Now, let's say that the new commits in
master are relevant to the feature that
you're working on. To incorporate the new commits into your
feature branch, you
have two options: merging or rebasing.