Suppose I have the following git tree in the beginning:
A -- B -- C -- D
I create a new branch:
git branch newbr
Then I committed one more change to master and switch to newbr
A -- B -- C -- D -- E
git checkout newbr
at this stage, I seem to have 2 ways to incorporate 'D' into newbr. 'git merge master' and 'git rebase master'. What's the difference between the two?
ps. I understand merge perfectly fine. So the question is what does 'rebased' do that's different from 'merge'?