Git error: Yourlocalchangestothefollowingfileswouldbeoverwritten

& Amp; nbsp; today, gitpull on the server has the following error: Yourlocalchang

 

Today, the following error occurs in git pull on the server:

Error: Your local changes to the following files wocould be overwritten by merge:

Application/config. php

Application/controllers/home. php

Please, commit your changes or stash them before you can merge.

Aborting

If you do not know the cause of the code conflict, the solution is as follows:

If you want to retain the changes made on the production server, just incorporate the new configuration items:

Git stash

Git pull

Git stash pop

Then, you can use git diff-w + file name to confirm the automatic code merging.

If you want to use a file in the code library to completely overwrite the local working version, the method is as follows:

Git reset -- hard

Git pull