If some configuration files in the system have been modified on the server, and some new configuration items will be added after development,
Code conflict occurs when this configuration file is published:
Error: Your local changes to the following files wocould be overwritten by merge:
Protected/config/Main. php
Please, commit your changes or stash them before you can merge.
If you want to retain the changes made on the production server and only incorporate the new configuration items, the solution is as follows:
git stashgit pullgit stash pop
Then, you can use git diff-W + file name to confirm the Automatic Code merging.
If you want to use the files in the code library to completely overwrite the local working version, the method is as follows:
git reset --hardgit pull
Git reset is for version. If you want to roll back local modifications to the file, use
git checkout HEAD file/to/restore
Iefreer