Menu
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: wp-content/w3tc-config/master.php Please, commit your changes or stash them before you can merge. So I ran,
git checkout -- wp-content/w3tc-config/master.php and tried again and I get the same message. I'm assuming that w3tc changed something in the config file on the server. I don't care whether the local copy or remote copy goes on the server (I suppose the remote one is best), I just want to be able to merge the rest of my changes (plugin updates).
Any ideas?
913
Most of cases the error Please, commit your changes or stash them before you can merge comes when you have made any changes to the local machine. After that, you must have pushed the changes to the Github remote repository. Now if anyone will pull all the changes from the remote then they will get the error.
Ideally, you'd like it to be clean before you attempt to merge in remote changes (remember, git pull = git fetch + git merge ). git commit is one way of accomplishing this, but it will alter your history--thereby polluting it if you're concerned about leaving your repo in a constantly working state.
git stash temporarily shelves (or stashes) changes you've made to your working copy so you can work on something else, and then come back and re-apply them later on.
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
git stash Do the merge, and then pull the stash:
git stash pop using git reset --hard
or git checkout -t -f remote/branch
using git checkout filename
114
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
