Git Pull Failed solution

Git Pull Failed solution
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

git commit/push

Read More: