"Git" error:your local changes to the following files

The following error occurred on the server today with Git pull:

Error:your local changes to the following files would is overwritten by merge:

application/config/config.php

application/controllers/home.php

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

Aborting

Do not know what causes the code conflict, the processing method is as follows:

If you want to keep the changes made on the production server, simply incorporate the new configuration entry:

Git stash

Git pull

Git stash pop

You can then use git diff-w + filenames to confirm the automatic merging of your code.

If you want to completely overwrite the local working version with the files in the code base. Here's how:

git reset--hard

Git pull

"Git" error:your local changes to the following files