(from the accepted answer to this StackOverflow question) Considering a scenario where you are in a production server, thus changes will NOT be commited from the server to Git, and ONLY will be pulling the most updated version from the Git server, here's what has to be done:
git checkout master
git fetch
git merge
If there are conflicts during the merge, and you want to overwrite your local version, you can do a hard reset (note: uncommited changes, even staged, will be lost):