Your branch and 'origin/master' have diverged, and have 1 and 3 different commits each, respectively

遇到這種報錯以後想回到matser上面，則執行git git fetch originfetchgit reset --hard origin/master

>>阅读原文<<