Git Pull Failed solution
https://blog.csdn.net/zxl1033394132/article/details/50853013?utm_source=blogxgwz0
https://www.cnblogs.com/daiyanren/p/9615698.html
The git server has changed
. Fix: when the modified code is ready to submit the code, the code changed by others in the group needs to be merged in first

git stash;
git pull;
git stash pop;

Conflicts are displayed, and if there are conflicts, manually modify them, and then commit the code

---

The idea of operating
git stash

git pull

git stash pop;


Merge conflicts

Finally
git commit/push