Your local changes to the following files would be overwritten by merge: . vs/slnx. sqlite

git pull Have a problem Every encounter git All the questions were quite wordless
Just enter these three lines of instructions to solve the problem

git stash

git pull origin master

git stash pop

Then our local code can be preserved and It can be merged with the code on the server
It is a perfect solution for developers