我git rebase最近开始使用,并不是100%肯定我做得对.为了这个问题,原点有两个分支,master并且next分支来自master.
自上次两者同步以来,master有2次提交和next6次:
$ git log --oneline origin/next..origin/master
59b5552 master commit #2
485a811 master commit #1
$ git log --oneline origin/master..origin/next
4ebf401 next commit #6
e9b6586 next commit #5
197ada0 next commit #4
4a2c3c6 next commit #3
040a055 next commit #2
84537bf next commit #1
当我结账next并执行时git rebase -i origin/master,我得到以下内容:
$ git status
# On branch next
# Your branch and 'origin/next' have diverged,
# …