Git pull code Conflict resolution method

When you use git pull code, you often encounter conflicts such as the following:

Error:your local changes to the following files would is overwritten by merge:
Dpcm/src/struts.xml
Please, commit your changes or stash them before you can merge.

In this case, you can use the following steps to resolve

First: Store files that are locally conflicting with the server first.

$ git stash

Second: Use the pull command to update the server to a local

$ git pull

Third: Restore the contents of the staging local

$ git stash pop stash{0}

IV: In the file of the local conflict, find the place with the mark (>>>>> stashed changes), solve according to the situation