on the Internet, I GIT one of other people"s projects and develop my own
. As a result, I modified a file locally in the project, and someone else updated
this time, which caused me to report an error in git pull this time.
use git stash to save to the staging area
git pull update to the local
git stash pop stash@ {0}
and then open the file, merge the code manually.
Let"s look at the picture. I don"t know what happened.