I made some updates on my local machine, pushed them to a remote repository, and now I'm trying to pull the changes to the server and I get the message;
error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
git checkout -- wp-content/w3tc-config/master.php
You can't merge with local modifications. Git protects you from losing potentially important changes.
You have three options.
git commit -m "My message"
Stashing acts as a stack, where you can push changes, and you pop them in reverse order.
To stash type:
Do the merge, and then pull the stash:
git stash pop
git reset --hard.