git pull origin masterled to an error:
error: Your local changes to the following files would be overwritten by merge: conf/site.conf.dist Please, commit your changes or stash them before you can merge. Aborting
I have no ideas what's going on here...so any advice would be very helpful! Are there step-by-step instructions for git-idiots (gidiots?) like me?
Thanks!
conf/site.conf.dist file. You can use
git diffto see what the changes actually are. You should not be editing this file, however, as the recommended approach is to make a copy of this file as
site.conf and edit that. That prevents this kind of problem when upgrading.
One way to proceed for now would be to use
git stash git pull origin master git stash popto save the changes in a special place, but remove them from your active files, then do the upgrade, then try to reapply the changes. You can leave off the last step if you just want a fresh copy of the distribution without your changes (that may depend on what you see when you do the
git diff).
There is no guarantee that the git stash pop will succeed, but it probably will. If not, you will get a merge conflict warning, and will have to edit the file by hand to remove the conflict.