应该是merge和rebase区别吧