可能重複:
master branch and 'origin/master' have diverged, how to 'undiverge' branches'?好的和清楚的瞭解git分支的分歧問題?
我一派,看了很多帖子,但沒有可以讓我瞭解分支發散問題呢。
如果我遠程跟蹤分支,我常常陷入如下:
$ git status
# On branch feature/worker-interface
# Your branch and 'origin/feature/worker-interface' have diverged,
# and have 1 and 4 different commit(s) each, respectively.
誰能有什麼好和明確的建議或點到好崗位關於這個混帳問題?