If you want to keep the changes made on the production server and just incorporate the new configuration items, do the following:
git stash
git pull
git stash pop
You can then use git diff -w +filename to confirm that the code was automatically merged.
Conversely, if you want to completely overwrite the local working version with the files in the codebase. Here's how:
git reset --hard
git pull