Rebasing is replaying history
Consider a common example
You are working on a feature branch...
Now somebody does more work on the master branch
You could merge changes from master with
git merge master
But then things get crazy if you do this several times when developing your feature
git rebase master
Sometimes a merge fails
Check your status:
Resolve conflicts and
git rebase --continue
What if we do not want C2, C3 and C4?
git rebase -i master