In Git, there are two main ways to integrate changes from one branch into another: the merge and the rebase.

 

https://git-scm.com/book/en/v2/Git-Branching-Rebasing

 

posted @ 2017-11-10 22:03  papering  阅读(149)  评论(0)  编辑  收藏  举报