git有以下信息：
Your branch and ‘origin/master‘ have diverged;
解决方案：
git fetch origin git reset --hard origin/master
git:Your branch and 'origin/master' have diverged
原文：https://www.cnblogs.com/coder-zyc/p/11523869.html
