git: Not possible to fast-forward, aborting

git pull的时候,如果本地也有未提交的代码,会报错:git: Not possible to fast-forward, aborting

使用下面命令解决

473