git pull Please commit your changes or stash them before you merge. Aborting

linux服务端的代码没有修改,git pull的时候提示:

Please commit your changes or stash them before you merge.
Aborting

WX20190612-202417@2x.png

解决办法

放弃本地修改
git reset --hard
git pull
发表新评论