NoneFirst, rewinding head to replay your work on top of it... Applying: init warning: Cannot merge binary files: android/gradle/wrapper/gradle-wrapper.jar (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-mdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-hdpi/ic_launcher.png (HEAD vs. init) Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging yarn.lock CONFLICT (add/add): Merge conflict in yarn.lock Auto-merging package.json CONFLICT (add/add): Merge conflict in package.json Auto-merging metro.config.js CONFLICT (add/add): Merge conflict in metro.config.js Auto-merging ios/ditto/main.m CONFLICT (add/add): Merge conflict in ios/ditto/main.m Auto-merging ios/ditto/Info.plist CONFLICT (add/add): Merge conflict in ios/ditto/Info.plist Auto-merging ios/ditto/Images.xcassets/Contents.json CONFLICT (add/add): Merge conflict in ios/ditto/Images.xcassets/Contents.json Auto-merging ios/ditto/Images.xcassets/AppIcon.appiconset/Contents.json CONFLICT (add/add): Merge conflict in ios/ditto/Images.xcassets/AppIcon.appiconset/Contents.json Auto-merging ios/ditto/AppDelegate.m CONFLICT (add/add): Merge conflict in ios/ditto/AppDelegate.m Auto-merging ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme Auto-merging ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto-tvOS.xcscheme CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto-tvOS.xcscheme Auto-merging ios/ditto.xcodeproj/project.pbxproj CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/project.pbxproj Auto-merging ios/Podfile.lock CONFLICT (add/add): Merge conflict in ios/Podfile.lock Auto-merging ios/Podfile CONFLICT (add/add): Merge conflict in ios/Podfile Auto-merging index.js CONFLICT (add/add): Merge conflict in index.js Auto-merging babel.config.js CONFLICT (add/add): Merge conflict in babel.config.js Auto-merging app.json CONFLICT (add/add): Merge conflict in app.json Auto-merging android/settings.gradle CONFLICT (add/add): Merge conflict in android/settings.gradle Auto-merging android/gradlew.bat CONFLICT (add/add): Merge conflict in android/gradlew.bat Auto-merging android/gradlew CONFLICT (add/add): Merge conflict in android/gradlew Auto-merging android/gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in android/gradle/wrapper/gradle-wrapper.properties Auto-merging android/gradle/wrapper/gradle-wrapper.jar CONFLICT (add/add): Merge conflict in android/gradle/wrapper/gradle-wrapper.jar Auto-merging android/gradle.properties CONFLICT (add/add): Merge conflict in android/gradle.properties Auto-merging android/build.gradle CONFLICT (add/add): Merge conflict in android/build.gradle Auto-merging android/app/src/main/res/values/strings.xml CONFLICT (add/add): Merge conflict in android/app/src/main/res/values/strings.xml Auto-merging android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-mdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-mdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-hdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-hdpi/ic_launcher.png Auto-merging android/app/src/main/java/com/ditto/MainApplication.java CONFLICT (add/add): Merge conflict in android/app/src/main/java/com/ditto/MainApplication.java Auto-merging android/app/src/main/java/com/ditto/MainActivity.java CONFLICT (add/add): Merge conflict in android/app/src/main/java/com/ditto/MainActivity.java Auto-merging android/app/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in android/app/src/main/AndroidManifest.xml Auto-merging android/app/src/debug/java/com/ditto/ReactNativeFlipper.java CONFLICT (add/add): Merge conflict in android/app/src/debug/java/com/ditto/ReactNativeFlipper.java Auto-merging android/app/build.gradle CONFLICT (add/add): Merge conflict in android/app/build.gradle Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 init Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)4 years ago
First, rewinding head to replay your work on top of it... Applying: init warning: Cannot merge binary files: android/gradle/wrapper/gradle-wrapper.jar (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-mdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-hdpi/ic_launcher.png (HEAD vs. init) Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging yarn.lock CONFLICT (add/add): Merge conflict in yarn.lock Auto-merging package.json CONFLICT (add/add): Merge conflict in package.json Auto-merging metro.config.js CONFLICT (add/add): Merge conflict in metro.config.js Auto-merging ios/ditto/main.m CONFLICT (add/add): Merge conflict in ios/ditto/main.m Auto-merging ios/ditto/Info.plist CONFLICT (add/add): Merge conflict in ios/ditto/Info.plist Auto-merging ios/ditto/Images.xcassets/Contents.json CONFLICT (add/add): Merge conflict in ios/ditto/Images.xcassets/Contents.json Auto-merging ios/ditto/Images.xcassets/AppIcon.appiconset/Contents.json CONFLICT (add/add): Merge conflict in ios/ditto/Images.xcassets/AppIcon.appiconset/Contents.json Auto-merging ios/ditto/AppDelegate.m CONFLICT (add/add): Merge conflict in ios/ditto/AppDelegate.m Auto-merging ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme Auto-merging ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto-tvOS.xcscheme CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto-tvOS.xcscheme Auto-merging ios/ditto.xcodeproj/project.pbxproj CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/project.pbxproj Auto-merging ios/Podfile.lock CONFLICT (add/add): Merge conflict in ios/Podfile.lock Auto-merging ios/Podfile CONFLICT (add/add): Merge conflict in ios/Podfile Auto-merging index.js CONFLICT (add/add): Merge conflict in index.js Auto-merging babel.config.js CONFLICT (add/add): Merge conflict in babel.config.js Auto-merging app.json CONFLICT (add/add): Merge conflict in app.json Auto-merging android/settings.gradle CONFLICT (add/add): Merge conflict in android/settings.gradle Auto-merging android/gradlew.bat CONFLICT (add/add): Merge conflict in android/gradlew.bat Auto-merging android/gradlew CONFLICT (add/add): Merge conflict in android/gradlew Auto-merging android/gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in android/gradle/wrapper/gradle-wrapper.properties Auto-merging android/gradle/wrapper/gradle-wrapper.jar CONFLICT (add/add): Merge conflict in android/gradle/wrapper/gradle-wrapper.jar Auto-merging android/gradle.properties CONFLICT (add/add): Merge conflict in android/gradle.properties Auto-merging android/build.gradle CONFLICT (add/add): Merge conflict in android/build.gradle Auto-merging android/app/src/main/res/values/strings.xml CONFLICT (add/add): Merge conflict in android/app/src/main/res/values/strings.xml Auto-merging android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-mdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-mdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-hdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-hdpi/ic_launcher.png Auto-merging android/app/src/main/java/com/ditto/MainApplication.java CONFLICT (add/add): Merge conflict in android/app/src/main/java/com/ditto/MainApplication.java Auto-merging android/app/src/main/java/com/ditto/MainActivity.java CONFLICT (add/add): Merge conflict in android/app/src/main/java/com/ditto/MainActivity.java Auto-merging android/app/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in android/app/src/main/AndroidManifest.xml Auto-merging android/app/src/debug/java/com/ditto/ReactNativeFlipper.java CONFLICT (add/add): Merge conflict in android/app/src/debug/java/com/ditto/ReactNativeFlipper.java Auto-merging android/app/build.gradle CONFLICT (add/add): Merge conflict in android/app/build.gradle Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 init Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)4 years ago
First, rewinding head to replay your work on top of it... Applying: init warning: Cannot merge binary files: android/gradle/wrapper/gradle-wrapper.jar (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-mdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-hdpi/ic_launcher.png (HEAD vs. init) Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging yarn.lock CONFLICT (add/add): Merge conflict in yarn.lock Auto-merging package.json CONFLICT (add/add): Merge conflict in package.json Auto-merging metro.config.js CONFLICT (add/add): Merge conflict in metro.config.js Auto-merging ios/ditto/main.m CONFLICT (add/add): Merge conflict in ios/ditto/main.m Auto-merging ios/ditto/Info.plist CONFLICT (add/add): Merge conflict in ios/ditto/Info.plist Auto-merging ios/ditto/Images.xcassets/Contents.json CONFLICT (add/add): Merge conflict in ios/ditto/Images.xcassets/Contents.json Auto-merging ios/ditto/Images.xcassets/AppIcon.appiconset/Contents.json CONFLICT (add/add): Merge conflict in ios/ditto/Images.xcassets/AppIcon.appiconset/Contents.json Auto-merging ios/ditto/AppDelegate.m CONFLICT (add/add): Merge conflict in ios/ditto/AppDelegate.m Auto-merging ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme Auto-merging ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto-tvOS.xcscheme CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto-tvOS.xcscheme Auto-merging ios/ditto.xcodeproj/project.pbxproj CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/project.pbxproj Auto-merging ios/Podfile.lock CONFLICT (add/add): Merge conflict in ios/Podfile.lock Auto-merging ios/Podfile CONFLICT (add/add): Merge conflict in ios/Podfile Auto-merging index.js CONFLICT (add/add): Merge conflict in index.js Auto-merging babel.config.js CONFLICT (add/add): Merge conflict in babel.config.js Auto-merging app.json CONFLICT (add/add): Merge conflict in app.json Auto-merging android/settings.gradle CONFLICT (add/add): Merge conflict in android/settings.gradle Auto-merging android/gradlew.bat CONFLICT (add/add): Merge conflict in android/gradlew.bat Auto-merging android/gradlew CONFLICT (add/add): Merge conflict in android/gradlew Auto-merging android/gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in android/gradle/wrapper/gradle-wrapper.properties Auto-merging android/gradle/wrapper/gradle-wrapper.jar CONFLICT (add/add): Merge conflict in android/gradle/wrapper/gradle-wrapper.jar Auto-merging android/gradle.properties CONFLICT (add/add): Merge conflict in android/gradle.properties Auto-merging android/build.gradle CONFLICT (add/add): Merge conflict in android/build.gradle Auto-merging android/app/src/main/res/values/strings.xml CONFLICT (add/add): Merge conflict in android/app/src/main/res/values/strings.xml Auto-merging android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-mdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-mdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-hdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-hdpi/ic_launcher.png Auto-merging android/app/src/main/java/com/ditto/MainApplication.java CONFLICT (add/add): Merge conflict in android/app/src/main/java/com/ditto/MainApplication.java Auto-merging android/app/src/main/java/com/ditto/MainActivity.java CONFLICT (add/add): Merge conflict in android/app/src/main/java/com/ditto/MainActivity.java Auto-merging android/app/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in android/app/src/main/AndroidManifest.xml Auto-merging android/app/src/debug/java/com/ditto/ReactNativeFlipper.java CONFLICT (add/add): Merge conflict in android/app/src/debug/java/com/ditto/ReactNativeFlipper.java Auto-merging android/app/build.gradle CONFLICT (add/add): Merge conflict in android/app/build.gradle Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 init Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)4 years ago
First, rewinding head to replay your work on top of it... Applying: init warning: Cannot merge binary files: android/gradle/wrapper/gradle-wrapper.jar (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-mdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-hdpi/ic_launcher.png (HEAD vs. init) Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging yarn.lock CONFLICT (add/add): Merge conflict in yarn.lock Auto-merging package.json CONFLICT (add/add): Merge conflict in package.json Auto-merging metro.config.js CONFLICT (add/add): Merge conflict in metro.config.js Auto-merging ios/ditto/main.m CONFLICT (add/add): Merge conflict in ios/ditto/main.m Auto-merging ios/ditto/Info.plist CONFLICT (add/add): Merge conflict in ios/ditto/Info.plist Auto-merging ios/ditto/Images.xcassets/Contents.json CONFLICT (add/add): Merge conflict in ios/ditto/Images.xcassets/Contents.json Auto-merging ios/ditto/Images.xcassets/AppIcon.appiconset/Contents.json CONFLICT (add/add): Merge conflict in ios/ditto/Images.xcassets/AppIcon.appiconset/Contents.json Auto-merging ios/ditto/AppDelegate.m CONFLICT (add/add): Merge conflict in ios/ditto/AppDelegate.m Auto-merging ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme Auto-merging ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto-tvOS.xcscheme CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto-tvOS.xcscheme Auto-merging ios/ditto.xcodeproj/project.pbxproj CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/project.pbxproj Auto-merging ios/Podfile.lock CONFLICT (add/add): Merge conflict in ios/Podfile.lock Auto-merging ios/Podfile CONFLICT (add/add): Merge conflict in ios/Podfile Auto-merging index.js CONFLICT (add/add): Merge conflict in index.js Auto-merging babel.config.js CONFLICT (add/add): Merge conflict in babel.config.js Auto-merging app.json CONFLICT (add/add): Merge conflict in app.json Auto-merging android/settings.gradle CONFLICT (add/add): Merge conflict in android/settings.gradle Auto-merging android/gradlew.bat CONFLICT (add/add): Merge conflict in android/gradlew.bat Auto-merging android/gradlew CONFLICT (add/add): Merge conflict in android/gradlew Auto-merging android/gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in android/gradle/wrapper/gradle-wrapper.properties Auto-merging android/gradle/wrapper/gradle-wrapper.jar CONFLICT (add/add): Merge conflict in android/gradle/wrapper/gradle-wrapper.jar Auto-merging android/gradle.properties CONFLICT (add/add): Merge conflict in android/gradle.properties Auto-merging android/build.gradle CONFLICT (add/add): Merge conflict in android/build.gradle Auto-merging android/app/src/main/res/values/strings.xml CONFLICT (add/add): Merge conflict in android/app/src/main/res/values/strings.xml Auto-merging android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-mdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-mdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-hdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-hdpi/ic_launcher.png Auto-merging android/app/src/main/java/com/ditto/MainApplication.java CONFLICT (add/add): Merge conflict in android/app/src/main/java/com/ditto/MainApplication.java Auto-merging android/app/src/main/java/com/ditto/MainActivity.java CONFLICT (add/add): Merge conflict in android/app/src/main/java/com/ditto/MainActivity.java Auto-merging android/app/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in android/app/src/main/AndroidManifest.xml Auto-merging android/app/src/debug/java/com/ditto/ReactNativeFlipper.java CONFLICT (add/add): Merge conflict in android/app/src/debug/java/com/ditto/ReactNativeFlipper.java Auto-merging android/app/build.gradle CONFLICT (add/add): Merge conflict in android/app/build.gradle Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 init Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)4 years ago
First, rewinding head to replay your work on top of it... Applying: init warning: Cannot merge binary files: android/gradle/wrapper/gradle-wrapper.jar (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-mdpi/ic_launcher.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (HEAD vs. init) warning: Cannot merge binary files: android/app/src/main/res/mipmap-hdpi/ic_launcher.png (HEAD vs. init) Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging yarn.lock CONFLICT (add/add): Merge conflict in yarn.lock Auto-merging package.json CONFLICT (add/add): Merge conflict in package.json Auto-merging metro.config.js CONFLICT (add/add): Merge conflict in metro.config.js Auto-merging ios/ditto/main.m CONFLICT (add/add): Merge conflict in ios/ditto/main.m Auto-merging ios/ditto/Info.plist CONFLICT (add/add): Merge conflict in ios/ditto/Info.plist Auto-merging ios/ditto/Images.xcassets/Contents.json CONFLICT (add/add): Merge conflict in ios/ditto/Images.xcassets/Contents.json Auto-merging ios/ditto/Images.xcassets/AppIcon.appiconset/Contents.json CONFLICT (add/add): Merge conflict in ios/ditto/Images.xcassets/AppIcon.appiconset/Contents.json Auto-merging ios/ditto/AppDelegate.m CONFLICT (add/add): Merge conflict in ios/ditto/AppDelegate.m Auto-merging ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto.xcscheme Auto-merging ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto-tvOS.xcscheme CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/xcshareddata/xcschemes/ditto-tvOS.xcscheme Auto-merging ios/ditto.xcodeproj/project.pbxproj CONFLICT (add/add): Merge conflict in ios/ditto.xcodeproj/project.pbxproj Auto-merging ios/Podfile.lock CONFLICT (add/add): Merge conflict in ios/Podfile.lock Auto-merging ios/Podfile CONFLICT (add/add): Merge conflict in ios/Podfile Auto-merging index.js CONFLICT (add/add): Merge conflict in index.js Auto-merging babel.config.js CONFLICT (add/add): Merge conflict in babel.config.js Auto-merging app.json CONFLICT (add/add): Merge conflict in app.json Auto-merging android/settings.gradle CONFLICT (add/add): Merge conflict in android/settings.gradle Auto-merging android/gradlew.bat CONFLICT (add/add): Merge conflict in android/gradlew.bat Auto-merging android/gradlew CONFLICT (add/add): Merge conflict in android/gradlew Auto-merging android/gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in android/gradle/wrapper/gradle-wrapper.properties Auto-merging android/gradle/wrapper/gradle-wrapper.jar CONFLICT (add/add): Merge conflict in android/gradle/wrapper/gradle-wrapper.jar Auto-merging android/gradle.properties CONFLICT (add/add): Merge conflict in android/gradle.properties Auto-merging android/build.gradle CONFLICT (add/add): Merge conflict in android/build.gradle Auto-merging android/app/src/main/res/values/strings.xml CONFLICT (add/add): Merge conflict in android/app/src/main/res/values/strings.xml Auto-merging android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-xhdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-xhdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-mdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-mdpi/ic_launcher.png Auto-merging android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Auto-merging android/app/src/main/res/mipmap-hdpi/ic_launcher.png CONFLICT (add/add): Merge conflict in android/app/src/main/res/mipmap-hdpi/ic_launcher.png Auto-merging android/app/src/main/java/com/ditto/MainApplication.java CONFLICT (add/add): Merge conflict in android/app/src/main/java/com/ditto/MainApplication.java Auto-merging android/app/src/main/java/com/ditto/MainActivity.java CONFLICT (add/add): Merge conflict in android/app/src/main/java/com/ditto/MainActivity.java Auto-merging android/app/src/main/AndroidManifest.xml CONFLICT (add/add): Merge conflict in android/app/src/main/AndroidManifest.xml Auto-merging android/app/src/debug/java/com/ditto/ReactNativeFlipper.java CONFLICT (add/add): Merge conflict in android/app/src/debug/java/com/ditto/ReactNativeFlipper.java Auto-merging android/app/build.gradle CONFLICT (add/add): Merge conflict in android/app/build.gradle Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 init Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)4 years ago
vinzent142