转载自 点击打开链接
git: Your branch and 'origin/master' have diverged
如果不需要保留本地的修改,只要执行下面两步:
git fetch origin
git reset --hard origin/master
转载自 点击打开链接
git: Your branch and 'origin/master' have diverged
如果不需要保留本地的修改,只要执行下面两步:
git fetch origin
git reset --hard origin/master