如何修复 pubspec.yaml 和 pubspec.lock 中的合并冲突？
[英]How do I fix merge conflic in pubspec.yaml and pubspec.lock?
问题描述
I stashed the recent change I have on my local machine, and then pull from the remote repository.
我将最近的更改存储在本地计算机上，然后从远程存储库中提取。 Along the way, I encounted the below error.一路上，我遇到了以下错误。 How can I merge my stash and also fix git conflict?如何合并我的存储并修复 git 冲突？
Auto-merging pubspec.yaml
CONFLICT (content): Merge conflict in pubspec.yaml
Auto-merging pubspec.lock
CONFLICT (content): Merge conflict in pubspec.lock
The stash entry is kept in case you need it again.
1 个解决方案
解决方案1
2 已采纳 2022-02-15 08:29:27
You need to open those two files and the conflicts will be shown to you.您需要打开这两个文件，冲突将显示给您。 Once you resolve them you can commit them and you will now have successfully merged.一旦你解决了它们，你就可以提交它们，你现在已经成功合并了。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.
相关问题
如何将 cloud_firestore 插件的主仓库版本（在 flutterfire 包中）添加到我的应用程序的 pubspec.yaml？ - How do i add the master repo version of cloud_firestore plugin (inside flutterfire package) to my app's pubspec.yaml?
Flutter/Git — 帮助替换 pubspec.yaml 中的 package - Flutter/Git — Help replacing package in pubspec.yaml
Flutter 的 pubspec.yaml 版本更改的自动提交标记 - Automatic commit tagging on pubspec.yaml version change for Flutter
Flutter Pubspec.yaml 警告：可发布包不能有 git 依赖项 - Flutter Pubspec.yaml Warning: Publishable packages can't have git dependencies
Flutter pubspec.yaml - 从分支添加分叉依赖 - 依赖可能只有一个来源 - Flutter pubspec.yaml - Adding forked dependency from branch - A dependency may only have one source
如何“合并”两个 YAML 文本文件？ - How do I "merge" two YAML text files?
如何修复未推送的合并commit（git）？ - How do I fix an unpushed merge commit(git)?
如何修复断点文件中的冲突的Git合并？ - How do I fix a Git merge with conflicts in breakpoint's file?
Git合并破坏了远程回购。 我如何解决它？ - Git merge broke remote repo. How do I fix it?
如何解决由于删除分支中的文件而导致的合并冲突？ - How do I fix a merge conflict due to removal of a file in a branch?
相关标签