平时都是从本地git push到服务器，偶尔服务器端修改提交后，本地需要先git pull把服务端的修改拉取下来，但是拉取的时候会出现如下错误：

error: Your local changes to the following files would be overwritten by merge:
	static/wmd/wmd.js.gz
Please, commit your changes or stash them before you can merge.
Aborting

git reset --hard
git pull