git merge vs git rebase

背景

开发过程，可能遇到这种情况

git merge效果

git checkout feature
git merge master

git rebase效果

git checkout feature
git rebase master

参考

https://www.atlassian.com/git/tutorials/merging-vs-rebasing/conceptual-overview