blocks|key|2805906|text|转到flutter主目录并执行git+checkout+.或git+reset+head+--hard|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2805907|entityMap^0|F|E|U|L|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|M|8|@]|D|@]|E|$]]]|G|$]]

Go to your flutter home directory and do <code>git checkout .</code> or <code>git reset head --hard</code>

blocks|key|79683|text|在Flutter安装目录中，请运行|type|unstyled|depth|inlineStyleRanges|entityRanges|data|79684|git+clean+-xfd
git+stash+save+--keep-index
git+stash+drop
git+pull
flutter+doctor|code-block|syntax|javascript|79685|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

In the Flutter install directory please run

<pre><code>git clean -xfd
git stash save --keep-index
git stash drop
git pull
flutter doctor
</code></pre>

blocks|key|79461|text|在我的案例中，git+status透露"You+have+unmerged+paths."|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|79462|79463|cd+$FLUTTER_HOME++++
git+reset+--hard+origin/stable|code-block|syntax|javascript|79464|entityMap^0|7|A|J|Q|0|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@$9|O|A|P|B|C]|$9|Q|A|R|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|S|8|@]|D|@]|E|$]]|$1|G|3|H|5|I|7|T|8|@]|D|@]|E|$J|K]]|$1|L|3|-4|5|6|7|U|8|@]|D|@]|E|$]]]|M|$]]

I had the same problem and <code>git reset --hard origin/beta</code> in the flutter home directory fixed it.
In my case <code>git status</code> revealed that <code>"You have unmerged paths."</code>

Note that for the stable branch you need this:

<pre><code>cd $FLUTTER_HOME 
git reset --hard origin/stable
</code></pre>

blocks|key|81269|text|下面和我一起获得了1.0.0-stable|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|81270|$+git+clean+-xfd
$+git+checkout+origin/stable
$+git+pull
$+flutter+doctor
$+flutter+--version
Flutter+1.0.0+•+channel+stable+•+https://github.com/flutter/flutter.git
Framework+•+revision+5391447fae+(5+days+ago)+•+2018-11-29+19:41:26+-0800
Engine+•+revision+7375a0f414
Tools+•+Dart+2.1.0+(build+2.1.0-dev.9.4+f9ebf21297)|code-block|syntax|javascript|81271|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/flutter/flutter/tree/stable^0|9|C|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@$A|R|B|S|1|T]]|C|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@]|C|$G|H]]|$1|I|3|-4|5|6|7|V|8|@]|9|@]|C|$]]]|J|$K|$5|L|M|N|C|$O|P]]]]

Below worked with me to get <a href="https://github.com/flutter/flutter/tree/stable" rel="nofollow noreferrer">1.0.0-stable</a>:

<pre><code>$ git clean -xfd
$ git checkout origin/stable
$ git pull
$ flutter doctor
$ flutter --version
Flutter 1.0.0 • channel stable • https://github.com/flutter/flutter.git
Framework • revision 5391447fae (5 days ago) • 2018-11-29 19:41:26 -0800
Engine • revision 7375a0f414
Tools • Dart 2.1.0 (build 2.1.0-dev.9.4 f9ebf21297)
</code></pre>

blocks|key|2805976|text|这也发生在我身上！我所做的就是将flutter.gradle重命名为任何名称，例如flutttttterrrr.gradle，然后再次运行flutter+upgrade命令。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2805977|该文件位于C:\your_flutter_location\flutter_main_folder\packages\flutter_tools\gradle|2805978|希望这对某些人有帮助。|2805979|entityMap^0|G|E|15|L|1X|F|0|5|22|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@$9|M|A|N|B|C]|$9|O|A|P|B|C]|$9|Q|A|R|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|S|8|@$9|T|A|U|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|V|8|@]|D|@]|E|$]]|$1|J|3|-4|5|6|7|W|8|@]|D|@]|E|$]]]|K|$]]

This happened to me too! What i did that worked was to rename <code>flutter.gradle</code> to anything e.g <code>flutttttterrrr.gradle</code> then run <code>flutter upgrade</code> command again.

The file is located at <code>C:\your_flutter_location\flutter_main_folder\packages\flutter_tools\gradle</code>

Hope this helps someone.

blocks|key|79701|text|这仅仅意味着您已经修改了flutter+sdk中的一些文件，要了解修改情况，请导航到您安装flutter+sdk的位置，然后输入命令git+status，您将看到已修改的红色文件的名称，例如，对我来说，它是dropdown.dart|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|79702|​|79703|📷|atomic|79704|79705|您可以通过运行命令git+stash将其添加到stash来删除这些更改|79706|现在，当你运行git+status时，它会提示你说|79707|nothing+to+commit,+working+tree+clean|79708|现在你可以运行了|79709|flutter+upgrade，并获得来自flutter社区的最新贡献。|79710|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/84c2ab98e5c60395a9ee34e1c4f5f099.png|imageAlt^0|1U|A|0|0|0|1|0|0|0|9|9|0|7|A|0|0|11|0|0|0|F|0^^$0|@$1|2|3|4|5|6|7|14|8|@$9|15|A|16|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|17|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|18|8|@]|D|@$9|19|A|1A|1|1B]]|E|$]]|$1|K|3|G|5|6|7|1C|8|@]|D|@]|E|$]]|$1|L|3|M|5|6|7|1D|8|@$9|1E|A|1F|B|C]]|D|@]|E|$]]|$1|N|3|O|5|6|7|1G|8|@$9|1H|A|1I|B|C]]|D|@]|E|$]]|$1|P|3|Q|5|6|7|1J|8|@$9|1K|A|1L|B|C]]|D|@]|E|$]]|$1|R|3|S|5|6|7|1M|8|@]|D|@]|E|$]]|$1|T|3|U|5|6|7|1N|8|@$9|1O|A|1P|B|C]]|D|@]|E|$]]|$1|V|3|-4|5|6|7|1Q|8|@]|D|@]|E|$]]]|W|$X|$5|Y|Z|10|E|$11|12|13|-4]]]]

This simply means that you have modified some file from the flutter sdk, to know the modification navigate to the location where you have flutter sdk installed,and enter the command <code>git status</code> and you will see the name of the files in red color that have been modified e.g for me it was dropdown.dart

<a href="https://i.stack.imgur.com/8gsxW.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/8gsxW.png" alt="enter image description here"></a>

you can remove those changes by adding it to stash by running the command
 <code>git stash</code>

And now again when you run 
<code>git status</code> it should prompt you saying 

<code>nothing to commit, working tree clean</code>

And now you are good to run

<code>flutter upgrade</code> and get your hands on the latest contributions from the flutter community.

blocks|key|2806092|text|对我来说起作用的是将Dart-SDK路径C:\Users\Profile-Name\flutter\bin\cache\dart-sdk添加到环境变量中的系统变量下。双击Path，单击dart新并添加/粘贴您的dart-sdk路径。最后，以管理员权限打开终端，运行flutter+doctor。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|2806093|entityMap^0|1Z|4|25|4|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|M|8|@]|D|@]|E|$]]]|G|$]]

What worked for me was adding Dart-SDK path C:\Users\Profile-Name\flutter\bin\cache\dart-sdk to Environment Variables under System Variables. Double click on Path, click on New and add/paste your dart-sdk path. Finally open terminal with admin priviledges and run flutter doctor.

blocks|key|81366|text|只是不知道有人还在面对这个问题。我找到了一个变通办法|type|unstyled|depth|inlineStyleRanges|entityRanges|data|81367|提交并推送您的代码更改。|81368|下载最新的flutter+sdk稳定版本。|81369|在任务管理器中结束adb并关闭visual+studio代码。|81370|将上一个颤动文件夹重命名为类似于"flutter_old“的名称。|81371|将新下载的颤振粘贴到src文件夹中。|81372|打开Visual+Code并运行flutter+doctor和flutter+packages，您就会得到更新。|81373|entityMap^0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Q|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|R|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|S|8|@]|9|@]|A|$]]|$1|H|3|I|5|6|7|T|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|U|8|@]|9|@]|A|$]]|$1|L|3|M|5|6|7|V|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|O|$]]

Just inacese someone is still facing this issue. I found a workaround
commit and push your code changes.
download the latest flutter sdk stable version.
end adb in task manager and close visual studio code.
Rename the previous flutter folder to something like &quot;flutter_old&quot;.
Paste the new downloaded flutter to src folder.
open Visual Code and run flutter doctor and flutter packages get and you are updated.

When I attempt to update Flutter I get the following error.

<blockquote>
 error: Your local changes to the following files would be overwritten
 by merge:
 examples/flutter_gallery/ios/Runner.xcodeproj/project.pbxproj 
 
 Please
 commit your changes or stash them before you merge. 
 
 Aborting Updating
 f9bb4289e..5ab9e7072 Process finished with exit code 1
</blockquote>

I suspect at some point I did something in the examples project and I don't care about loosing the changes. 

What is the easiest thing to do?

Flutter upgrade fail

Flutter

当我尝试更新颤动时，我得到了以下错误。合并错误:对以下文件所做的本地更改将被覆盖: examples/flutter_gallery/ios/Runner.xcodeproj/project.pbxproj请在合并之前提交或隐藏您的更改。正在中止更新f9bb4289e..5ab9e7072进程已完成，退出代码为%1我怀疑在某个时刻我在examples项目中做了一些事情，我并不关心丢失更改。最简单的

问颤动升级失败
EN

回答 8

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问颤动升级失败EN

回答 8

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问颤动升级失败
EN