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 先描

>>阅读原文<<