git merge branch

## git checkout master

(base) sungmin@sungminyunui-MacBookPro git % git checkout master Already on 'master' Your branch is up to date with 'origin/master'. (base) sungmin@sungminyunui-MacBookPro git % git merge v2 merge: v2 - not something we can merge Did you mean this? origin/v2

## prepare oracle client

(base) sungmin@sungminyunui-MacBookPro git % git merge --squash origin/v2 error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. (base) sungmin@sungminyunui-MacBookPro git % git push -f warning: redirecting to http://git.gnoti.com/gnoti/git.git/ Everything up-to-date (base) sungmin@sungminyunui-MacBookPro git % git merge --squash origin/v2 error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. (base) sungmin@sungminyunui-MacBookPro git % git add lib/components/custom_progress.dart (base) sungmin@sungminyunui-MacBookPro git % git commit 'v2' fatal: cannot do a partial commit during a merge. (base) sungmin@sungminyunui-MacBookPro git % git push warning: redirecting to http://git.gnoti.com/gnoti/git.git/ Everything up-to-date (base) sungmin@sungminyunui-MacBookPro git % ls README.md android assets ios lib plugins pubspec.yaml (base) sungmin@sungminyunui-MacBookPro git % (base) sungmin@sungminyunui-MacBookPro git % (base) sungmin@sungminyunui-MacBookPro git % pwd /Users/sungmin/Downloads/git3/gitmerge/git (base) sungmin@sungminyunui-MacBookPro git % (base) sungmin@sungminyunui-MacBookPro git % (base) sungmin@sungminyunui-MacBookPro git % git fetch origin warning: redirecting to http://git.gnoti.com/gnoti/git.git/ (base) sungmin@sungminyunui-MacBookPro git % git checkout -b "v2" "origin/v2" lib/components/custom_combobox.dart: needs merge lib/pages/player/midi/midi_page2.dart: needs merge error: you need to resolve your current index first (base) sungmin@sungminyunui-MacBookPro git % git fetch origin warning: redirecting to http://git.gnoti.com/gnoti/git.git/ (base) sungmin@sungminyunui-MacBookPro git % git checkout "master" lib/components/custom_combobox.dart: needs merge lib/pages/player/midi/midi_page2.dart: needs merge error: you need to resolve your current index first (base) sungmin@sungminyunui-MacBookPro git % (base) sungmin@sungminyunui-MacBookPro git % (base) sungmin@sungminyunui-MacBookPro git % git merge --no-ff "v2" error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. (base) sungmin@sungminyunui-MacBookPro git % git push origin "master" warning: redirecting to http://git.gnoti.com/gnoti/git.git/ Everything up-to-date (base) sungmin@sungminyunui-MacBookPro git % git fetch origin git checkout -b "v2" "origin/v2" warning: redirecting to http://git.gnoti.com/gnoti/git.git/ lib/components/custom_combobox.dart: needs merge lib/pages/player/midi/midi_page2.dart: needs merge error: you need to resolve your current index first (base) sungmin@sungminyunui-MacBookPro git % git status On branch master Your branch is up to date with 'origin/master'. You have unmerged paths. (fix conflicts and run "git commit") (use "git merge --abort" to abort the merge) Changes to be committed: modified: .flutter-plugins modified: .flutter-plugins-dependencies modified: .packages modified: android/app/build.gradle modified: android/app/src/main/AndroidManifest.xml modified: android/app/src/main/kotlin/kr/keumyoung/git/MidiPlayer.kt new file: android/app/src/main/res/drawable/intro.jpg modified: android/app/src/main/res/drawable/launch_background.xml modified: android/build.gradle new file: assets/images/1vs1_faq.png new file: assets/images/banner.png new file: assets/images/escalicon.png new file: assets/images/folder.png new file: assets/images/git_daily.png new file: assets/images/gear.png modified: assets/images/genreBallad.png modified: assets/images/genreDance.png modified: assets/images/genreHiphop.png modified: assets/images/genreKids.png modified: assets/images/genrePop.png modified: assets/images/genreRnb.png modified: assets/images/genreRock.png modified: assets/images/genreTrot.png new file: assets/images/intro.jpg new file: assets/images/logo_v2.png new file: assets/images/logout.png new file: assets/images/mini_menu.png new file: assets/images/mini_next.png new file: assets/images/mini_play.png new file: assets/images/mini_pre.png new file: assets/images/my_info.png new file: assets/images/pick1.png new file: assets/images/pick2.png new file: assets/images/pick3.png new file: assets/images/pick4.png new file: assets/images/pick5.png new file: assets/images/pick6.png new file: assets/images/pip2.png new file: assets/images/singing_method.png new file: assets/images/theme.png new file: assets/images/ticket.png new file: assets/images/ticket_buy.png new file: assets/images/ticketeng.png new file: assets/images/toolbar_home.png new file: assets/images/toolbar_locker.png new file: assets/images/toolbar_pick.png new file: assets/images/toolbar_search.png new file: assets/images/toolbar_video.png new file: assets/images/video.png new file: assets/thumbnails/101.jpg new file: assets/thumbnails/102.jpg new file: assets/translations/en.json modified: assets/translations/ko.json new file: ios/CMakeLists.txt new file: ios/Flutter/.last_build_id modified: ios/Flutter/AppFrameworkInfo.plist modified: ios/Podfile modified: ios/Podfile.lock modified: ios/Runner.xcodeproj/project.pbxproj modified: ios/Runner.xcworkspace/contents.xcworkspacedata modified: ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted: ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings modified: ios/Runner/Base.lproj/LaunchScreen.storyboard modified: ios/Runner/Info.plist modified: ios/Runner/MidiPlayer.swift modified: ios/converter/mFileSave.h modified: ios/converter/mMid.cpp modified: ios/converter/mMidEditorSmfTrk.cpp modified: ios/converter/mMidReaderBaseTrkEvent.h new file: ios/target.h modified: lib/app.dart modified: lib/base_cubit.dart modified: lib/base_navigator.dart modified: lib/base_route.dart new file: lib/components/broadcasting.dart new file: lib/components/custom_detail_container.dart modified: lib/components/custom_progress.dart new file: lib/components/custom_search_bar.dart new file: lib/components/orientation_switcher.dart modified: lib/main.dart new file: lib/models/ads_model.dart modified: lib/models/favorite_model.dart new file: lib/models/fgroup_model.dart new file: lib/models/pick_category_model.dart new file: lib/models/pick_model.dart new file: lib/models/purchasehistory.dart new file: lib/models/search_word_model.dart new file: lib/pages/_cells/pick_cell.dart new file: lib/pages/_cells/search_word_cell.dart modified: lib/pages/_cells/song_cell.dart modified: lib/pages/_cells/song_large_cell.dart modified: lib/pages/_views/color_cover_text.dart new file: lib/pages/auth/Social_register/Social_webview_cubit.dart new file: lib/pages/auth/Social_register/Social_webview_page.dart modified: lib/pages/auth/auth_cubit.dart modified: lib/pages/auth/auth_page.dart new file: lib/pages/auth/change_password/change_password_cubit.dart new file: lib/pages/auth/change_password/change_password_page.dart modified: lib/pages/auth/forgot_password/forgot_password_page.dart modified: lib/pages/auth/sign_in_email/sign_in_email_cubit.dart modified: lib/pages/auth/sign_in_email/sign_in_email_page.dart modified: lib/pages/auth/sign_up_email/sign_up_email_cubit.dart modified: lib/pages/auth/sign_up_email/sign_up_email_page.dart new file: lib/pages/coupon_page.dart modified: lib/pages/dashboard/dashboard_cubit.dart modified: lib/pages/dashboard/dashboard_page.dart new file: lib/pages/gift_page.dart modified: lib/pages/main/main_cubit.dart modified: lib/pages/main/main_page.dart modified: lib/pages/musicList/famous_music_list/famous_music_list_page.dart modified: lib/pages/musicList/genre_music_list/genre_music_list_page.dart new file: lib/pages/pick/pick_cubit.dart new file: lib/pages/pick/pick_page.dart new file: lib/pages/playList/play_favorite_page.dart modified: lib/pages/playList/play_list_cubit.dart modified: lib/pages/playList/play_list_page.dart deleted: lib/pages/player/midi/midi_cubit.dart new file: lib/pages/player/midi/midi_cubit3.dart deleted: lib/pages/player/midi/midi_page.dart new file: lib/pages/player/midi/midi_page3.dart modified: lib/pages/purchase_page.dart modified: lib/pages/search/search_cubit.dart modified: lib/pages/search/search_page.dart modified: lib/pages/setting/setting_page.dart new file: lib/pages/setting/setting_setting_cubit.dart new file: lib/pages/setting/setting_setting_page.dart modified: lib/pages/setting/setting_theme/setting_theme_page.dart new file: lib/pages/speech/speech_cubit.dart new file: lib/pages/speech/speech_page.dart modified: lib/pages/splash/splash_cubit.dart modified: lib/pages/splash/splash_page.dart modified: lib/pages/user/user_cubit.dart modified: lib/pages/user/user_page.dart new file: lib/pages/video/video_cubit.dart new file: lib/pages/video/video_page.dart new file: lib/pages/webview/webview_cubit.dart new file: lib/pages/webview/webview_page.dart modified: lib/tools/firebase_client.dart new file: lib/tools/git_player.dart new file: lib/tools/indexedStack_client.dart modified: lib/tools/midi_player.dart new file: lib/tools/mini_player_widget.dart modified: lib/tools/network_client.dart modified: lib/tools/property_client.dart modified: lib/tools/sqlite_client.dart new file: lib/tools/webview_client.dart new file: plugins/audio_manager/CHANGELOG.md new file: plugins/audio_manager/LICENSE new file: plugins/audio_manager/README.md new file: plugins/audio_manager/android/build.gradle new file: plugins/audio_manager/android/gradle/wrapper/gradle-wrapper.properties new file: plugins/audio_manager/android/settings.gradle new file: plugins/audio_manager/android/src/main/AndroidManifest.xml new file: plugins/audio_manager/android/src/main/java/cc/dync/audio_manager/AudioManagerPlugin.java new file: plugins/audio_manager/android/src/main/java/cc/dync/audio_manager/ByteMediaDataSource.java new file: plugins/audio_manager/android/src/main/java/cc/dync/audio_manager/MediaPlayerHelper.java new file: plugins/audio_manager/android/src/main/java/cc/dync/audio_manager/MediaPlayerService.java new file: plugins/audio_manager/android/src/main/java/cc/dync/audio_manager/VolumeChangeObserver.java new file: plugins/audio_manager/android/src/main/res/drawable-hdpi/ic_notify.png new file: plugins/audio_manager/android/src/main/res/drawable-mdpi/ic_notify.png new file: plugins/audio_manager/android/src/main/res/drawable-xhdpi/ic_notify.png new file: plugins/audio_manager/android/src/main/res/drawable-xxhdpi/ic_notify.png new file: plugins/audio_manager/android/src/main/res/drawable-xxxhdpi/ic_notify.png new file: plugins/audio_manager/android/src/main/res/drawable/ic_launcher.png new file: plugins/audio_manager/android/src/main/res/layout/layout_mediaplayer.xml new file: plugins/audio_manager/android/src/main/res/values-ko/strings.xml new file: plugins/audio_manager/android/src/main/res/values/strings.xml new file: plugins/audio_manager/example/README.md new file: plugins/audio_manager/example/android/app/build.gradle new file: plugins/audio_manager/example/android/app/src/main/AndroidManifest.xml new file: plugins/audio_manager/example/android/app/src/main/java/cc/dync/audio_manager_example/MainActivity.java new file: plugins/audio_manager/example/android/app/src/main/res/drawable/launch_background.xml new file: plugins/audio_manager/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file: plugins/audio_manager/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file: plugins/audio_manager/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file: plugins/audio_manager/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file: plugins/audio_manager/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file: plugins/audio_manager/example/android/app/src/main/res/values/styles.xml new file: plugins/audio_manager/example/android/app/src/profile/AndroidManifest.xml new file: plugins/audio_manager/example/android/build.gradle new file: plugins/audio_manager/example/android/gradle.properties new file: plugins/audio_manager/example/android/gradle/wrapper/gradle-wrapper.properties new file: plugins/audio_manager/example/android/settings.gradle new file: plugins/audio_manager/example/assets/aLIEz.jpg new file: plugins/audio_manager/example/assets/aLIEz.m4a new file: plugins/audio_manager/example/assets/ic_launcher.png new file: plugins/audio_manager/example/assets/xv.jpg new file: plugins/audio_manager/example/assets/xv.mp3 new file: plugins/audio_manager/example/ios/Flutter/.last_build_id new file: plugins/audio_manager/example/ios/Flutter/AppFrameworkInfo.plist new file: plugins/audio_manager/example/ios/Flutter/Debug.xcconfig new file: plugins/audio_manager/example/ios/Flutter/Release.xcconfig new file: plugins/audio_manager/example/ios/Podfile new file: plugins/audio_manager/example/ios/Runner.xcodeproj/project.pbxproj new file: plugins/audio_manager/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file: plugins/audio_manager/example/ios/Runner/AppDelegate.swift new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file: plugins/audio_manager/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file: plugins/audio_manager/example/ios/Runner/Base.lproj/LaunchScreen.storyboard new file: plugins/audio_manager/example/ios/Runner/Base.lproj/Main.storyboard new file: plugins/audio_manager/example/ios/Runner/Info.plist new file: plugins/audio_manager/example/ios/Runner/Runner-Bridging-Header.h new file: plugins/audio_manager/example/lib/main.dart new file: plugins/audio_manager/example/pubspec.yaml new file: plugins/audio_manager/example/test/widget_test.dart new file: plugins/audio_manager/example/web/favicon.png new file: plugins/audio_manager/example/web/icons/Icon-192.png new file: plugins/audio_manager/example/web/icons/Icon-512.png new file: plugins/audio_manager/example/web/index.html new file: plugins/audio_manager/example/web/manifest.json new file: plugins/audio_manager/ios/Assets/.gitkeep new file: plugins/audio_manager/ios/Classes/AudioManager.swift new file: plugins/audio_manager/ios/Classes/AudioManagerPlugin.h new file: plugins/audio_manager/ios/Classes/AudioManagerPlugin.m new file: plugins/audio_manager/ios/Classes/SwiftAudioManagerPlugin.swift new file: plugins/audio_manager/ios/audio_manager.podspec new file: plugins/audio_manager/lib/audio_manager.dart new file: plugins/audio_manager/lib/audio_manager_web.dart new file: plugins/audio_manager/lib/src/AudioInfo.dart new file: plugins/audio_manager/lib/src/AudioType.dart new file: plugins/audio_manager/pubspec.yaml new file: plugins/audio_manager/screenshots/android.png new file: plugins/audio_manager/screenshots/android2.png new file: plugins/audio_manager/screenshots/iOS.png new file: plugins/audio_manager/screenshots/iOS2.jpeg new file: plugins/audio_manager/test/audio_manager_test.dart modified: plugins/audio_recorder/example/android/.project modified: plugins/audio_recorder/example/android/app/src/main/res/drawable/launch_background.xml modified: pubspec.yaml Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) both added: lib/components/custom_combobox.dart deleted by them: lib/pages/player/midi/midi_page2.dart (base) sungmin@sungminyunui-MacBookPro git % git add lib/components/custom_combobox.dart (base) sungmin@sungminyunui-MacBookPro git % git add lib/pages/player/midi/midi_page2.dart (base) sungmin@sungminyunui-MacBookPro git % git commit [master 09496a3] Merge remote-tracking branch 'origin/v2' (base) sungmin@sungminyunui-MacBookPro git % git push warning: redirecting to http://git.gnoti.com/gnoti/git.git/ Enumerating objects: 31, done. Counting objects: 100% (31/31), done. Delta compression using up to 8 threads Compressing objects: 100% (11/11), done. Writing objects: 100% (11/11), 2.25 KiB | 2.25 MiB/s, done. Total 11 (delta 8), reused 0 (delta 0) To http://git.gnoti.com/gnoti/git 0132f97..09496a3 master -> master (base) sungmin@sungminyunui-MacBookPro git %