git使用

摘自别人

一、报错总结

1 "On branch master Your branch and ‘origin/master’ have diverged, and have 1 and 8 different commits "
solution: 执行以下三条语句
git fetch origin master
git merge origin FETCH_HEAD
git push --force #可能可以不要force 或者试试这个 git push --force-with-lease

如果分支只有我一个人操作 则没事，详见： https://blog.csdn.net/LeviDing/article/details/76789443

或这里：
https://blog.csdn.net/m0_37806112/article/details/82289606

与pull操作不正确有关

2