flutter更新 Your local changes to the following files would be overwritten by merge

Flutter升级更新的时候报错Your local changes to the following files would be overwritten by merge....

Please commit your changes or stash them before you merge

解决办法   打开终端

1. $ cd /Users/用户名/FlutterSDK/flutter 

2.$  git status

3.$ git branch

4.$ git reset --hard HEAD

5.$ git pull

6 $ flutter upgrade