Analog timeline describing the phenomenon
2020.03.27 online git pull origin master released after pulling code, bug after release, so directly modify the bug directly in the production environment where the server path in the project file, change the code.
2020.03.28 push the changes to the previous master branch line.
When 2020.04.02 online publishing again, git pull origin master when the code merge conflicts. Because Earlier changes to the production environment code.
solution
Directly in the path of the project, use the following command to ignore the previous line changes to the master branch prevail latest code
git checkout .
