Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

react-native-git-upgrade breaks over yarn.lock? #12486

Closed
braco opened this issue Feb 21, 2017 · 1 comment
Closed

react-native-git-upgrade breaks over yarn.lock? #12486

braco opened this issue Feb 21, 2017 · 1 comment
Labels
Resolution: Locked This issue was locked by the bot.

Comments

@braco
Copy link

braco commented Feb 21, 2017

--- Please use this template, and delete everything above this line before submitting your issue ---

Description

react-native-git-upgrade seems to fail with "error: yarn.lock: does not exist in index"

$ react-native-git-upgrade --version
0.2.7

$ react-native-git-upgrade

...
HEAD is now at 6f89aa9 Project snapshot
git-upgrade info Apply the patch
error: patch failed: .flowconfig:28
Falling back to three-way merge...
Applied patch to '.flowconfig' with conflicts.
error: patch failed: .gitignore:34
Falling back to three-way merge...
Applied patch to '.gitignore' with conflicts.
error: patch failed: android/app/src/main/java/com/ditto/MainApplication.java:17
Falling back to three-way merge...
Applied patch to 'android/app/src/main/java/com/ditto/MainApplication.java' cleanly.
error: patch failed: ios/ditto.xcodeproj/project.pbxproj:22
Falling back to three-way merge...
Applied patch to 'ios/ditto.xcodeproj/project.pbxproj' with conflicts.
error: patch failed: ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme:3
Falling back to three-way merge...
Applied patch to 'ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme' cleanly.
error: patch failed: ios/ditto/AppDelegate.m:9
Falling back to three-way merge...
Applied patch to 'ios/ditto/AppDelegate.m' with conflicts.
error: patch failed: ios/ditto/Info.plist:4
Falling back to three-way merge...
Applied patch to 'ios/ditto/Info.plist' with conflicts.
error: yarn.lock: does not exist in index
git-upgrade WARN The upgrade process succeeded but there might be conflicts to be resolved. See above for the list of files that have merge conflicts.

Despite success message, none of the files in my project are changed.

Reproduction

yarn add react-native@0.39.x

react-native-git-upgrade

Solution

Not sure about solution. Tried to override .gitignore and add yarn.lock to a commit, didn't work

Additional Information

  • React Native version: 0.39.x
  • Platform: n/a
  • Operating System: MacOS
@dwilt
Copy link

dwilt commented Feb 22, 2017

@braco sounds like a duplicate of #12112

@facebook facebook locked as resolved and limited conversation to collaborators May 24, 2018
@react-native-bot react-native-bot added the Resolution: Locked This issue was locked by the bot. label Jul 19, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Resolution: Locked This issue was locked by the bot.
Projects
None yet
Development

No branches or pull requests

4 participants