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
Read More:
- Git solves pull origin error: the following untracked working tree files would be rewritten by merge
- Error: your local changes to the following files would be rewritten by merge solution
- Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then
- Resolving fatal: reusing to merge unrelated histories in Git
- You need to resolve your current index first
- [FAQ] after git merge, the push to Gerrit fails, indicating no new changes?
- How to use vimdiff to solve conflict?
- Merging is not possible because you have unmerged files
- Git pull undo misoperation
- How to solve error: failed to push some refs to ‘[email protected]:……git pull conflict
- Git failed to submit data error: failed to push some refs to’https://github.com/XXXXXXX/gif.git’
- Failed to push some refs to
- Git stash temporary storage recovery and file deletion recovery
- git push error failed to push some refs to solution
- Git push you are not allowed to upload merges
- You have not concluded your merge (MERGE_HEAD exists)
- [Git] git pull pull remote git push to remote git commit submit reject
- Git pull error: pull is not possible because you have unmerged files
- Idea submits code to git / code cloud warehouse for the first time
- Git removes the content of stash