flutter upgrade ignores local repo changes #6349
Description
flutter upgrade ignores git errors when you have conflicting changes locally, and continues the upgrade even though nothing from the remote repo was fetched.
Upgrading Flutter from /Users/devoncarew/projects/flutter...
From https://github.com/flutter/flutter
93d757c..06babb2 master -> upstream/master
error: Your local changes to the following files would be overwritten by merge:
examples/hello_world/hello_world.iml
Please commit your changes or stash them before you can merge.
Aborting
Updating 93d757c..06babb2
Building unlinked bundles for flutter... 3.2s
Building unlinked bundles for flutter_driver... 0.1s