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

>>阅读原文<<