Flutter升级给出错误，而不是升级到最新版本

Question

升级Flutter SDK和软件包

    My-Mac:~ admin$ flutter upgrade

    Upgrading Flutter from /Users/admin/Desktop/SDK/flutter...
    error: Your local changes to the following files would be overwritten by merge:
        packages/flutter/lib/src/services/message_codecs.dart
    Please commit your changes or stash them before you merge.
    Aborting
    Updating 2eeeXXXe9..7XXXbf4aX

我已经去了扑动的SDK并检查status并得到了下面的东西

My-Mac:flutter admin$  git status
On branch master
Your branch is behind 'origin/master' by 565 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
modified:   dev/automated_tests/pubspec.yaml
modified:   dev/benchmarks/complex_layout/pubspec.yaml
modified:   dev/benchmarks/macrobenchmarks/pubspec.yaml
modified:   dev/benchmarks/microbenchmarks/pubspec.yaml
modified:   dev/bots/pubspec.yaml
modified:   dev/devicelab/pubspec.yaml
modified:   dev/integration_tests/android_semantics_testing/pubspec.yaml
modified:   dev/integration_tests/android_views/pubspec.yaml
modified:   dev/integration_tests/channels/pubspec.yaml
modified:   dev/integration_tests/external_ui/pubspec.yaml
modified:   dev/integration_tests/flavors/pubspec.yaml
modified:   dev/integration_tests/platform_interaction/pubspec.yaml
modified:   dev/integration_tests/ui/pubspec.yaml
modified:   dev/manual_tests/pubspec.yaml
modified:   dev/snippets/pubspec.yaml
modified:   dev/tools/pubspec.yaml
modified:   dev/tools/vitool/pubspec.yaml
modified:   examples/catalog/pubspec.yaml
modified:   examples/flutter_gallery/pubspec.yaml
modified:   examples/hello_world/pubspec.yaml
modified:   examples/layers/pubspec.yaml
modified:   examples/platform_channel/pubspec.yaml
modified:   examples/platform_channel_swift/pubspec.yaml
modified:   examples/stocks/pubspec.yaml
modified:   packages/flutter/lib/src/services/message_codecs.dart
modified:   packages/flutter/pubspec.yaml
modified:   packages/flutter_driver/pubspec.yaml
modified:   packages/flutter_goldens/pubspec.yaml
modified:   packages/flutter_localizations/pubspec.yaml
modified:   packages/flutter_test/pubspec.yaml
modified:   packages/flutter_tools/pubspec.yaml
modified:   packages/fuchsia_remote_debug_protocol/pubspec.yaml

Untracked files:
  (use "git add <file>..." to include in what will be committed)

    OLDSDK.zip

no changes added to commit (use "git add" and/or "git commit -a")

执行上述任务后，现在尝试再次升级Flutter但是再次出现下面提到的错误

My-Mac:flutter admin$ flutter upgrade
    Building flutter tool...
    Because flutter_tools depends on sockjs_client 0.3.5 which doesn't match any versions, version solving failed.
    Error: Unable to 'pub upgrade' flutter tool. Retrying in five seconds... (9 tries left)
    .
    .
    Error: Unable to 'pub upgrade' flutter tool. Retrying in five seconds... (1 tries left)
    Command 'pub upgrade' still failed after 10 tries, giving up.

Answer 1

Flutter使用git进行SDK管理。您需要查看位于$ HOME / development / flutter中的存储库。您可以使用git命令检查您的存储状态。例如，

$ git状态

看你当地的变化

$ git branch

查看您正在使用的分支。

当您发现自己已经更改了未提交的内容时，以下步骤可能会对您有所帮助，但您希望将所有已更改的内容撤消到只需切换到最新版本（主数据库）。

$ git reset --hard HEAD

撤消所有更改。

$ git checkout master

切换到主分支

$ go pull

下拉并同步服务器上的所有提交。

Answer 2

您可能会意外地编辑颤振代码。

要修复它，请转到flutter文件夹，它应该是/ Users / admin / Desktop / SDK / flutter

并通过运行检查任何更改

git status

如果有任何变化，在你的情况下你做了更改包/ flutter / lib / src / services / message_codecs.dart，只需将其恢复为：

git checkout -- packages/flutter/lib/src/services/message_codecs.dart