Git branch has diverged after rebase

背景 最近在使用git的过程当中遇到了以下问题:git Your branch and 'origin/xxx' have diverged, and have 8 and 4 different commits each .... 这个问题跟前面说的另一篇文章: Git - Your branch and ‘origin/xxx’ have diverged有点相似，但又有些不一样。web 先描

>>阅读原文<<