Merge the incoming区别与Rebase the current branch on top of xxx区别

Merge the incoming changes into the current branch:将传入的更改合并到当前分支中 Rebase the current branch on top of the incoming changes:在传入更改的基础上重新建立当前分支

>>阅读原文<<