Yesterday, my Git server was down and I needed to do some urgent updates to my production system which usually runs 'sudo git pull' from my Git server to fetch the latest changes.
Now that my Git server is up and running again, I've committed a modified version of the changes to Git and would like to pull them on my production server, however, its telling me:
error: Your local changes to the following files would be overwritten by merge:
config.php
Please commit your changes or stash them before you merge
I want to overwrite the file on my production server with the latest commit from the master branch. How can I do that from my production server?