Flutter提示Your local changes to the following files would be overwritten by merge: xxx/...

Your local changes to the following files would be overwritten by merge: xxx/...

在终端使用flutter upgrade命令时,某次提示如上信息,这个其实是Git出现冲突而产生的error。
解决办法:先使用如下命令,再进行相关操作

git stash //备份
git pull //拉取
git stash pop //恢复

你可能感兴趣的:(Flutter提示Your local changes to the following files would be overwritten by merge: xxx/...)