How to solve git pull conflicts

When multiple developers develop projects together, there may be conflicts with git pull. In this case, you can solve the problem by using the following methods:

Git stash
Git pull
Git stash pop

Locally modified git stash
Git pull pulls new changes from the remote version Library
Git stash pop combines temporary changes to the local working Database. If there is a conflict, a prompt will be prompted to resolve the conflict and submit it.