git:Your branch and 'origin/master' have diverged git有以下信息: Your branch and 'origin/master' have diverged; 解决方案: git fetch origin git reset --hard origin/master