How do I fix merge conflic in pubspec.yaml and pubspec.lock?
Question
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?
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 answers
solution1
2 ACCPTED 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.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.
Related Question
How do i add the master repo version of cloud_firestore plugin (inside flutterfire package) to my app's pubspec.yaml?
Flutter/Git — Help replacing package in pubspec.yaml
Automatic commit tagging on pubspec.yaml version change for Flutter
Flutter Pubspec.yaml Warning: Publishable packages can't have git dependencies
Flutter pubspec.yaml - Adding forked dependency from branch - A dependency may only have one source
How do I "merge" two YAML text files?
How do I fix an unpushed merge commit(git)?
How do I fix a Git merge with conflicts in breakpoint's file?
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?
Related Tags