Created
October 7, 2015 23:58
-
-
Save threadhead/f1b822bf5cb929282e93 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ➜ nemo git:(master) ✗ git pull origin master | |
| From github.secureserver.net:PC/nemo | |
| * branch master -> FETCH_HEAD | |
| warning: fetch updated the current branch head. | |
| fast-forwarding your working tree from | |
| commit caeff76c17960adf7fc123a27b9e8a9f2d7205b7. | |
| error: Your local changes to the following files would be overwritten by merge: | |
| nemo/Gemfile | |
| nemo/Gemfile.lock | |
| nemo/app/themes/001/V1/assets/images/thumb_large.png | |
| nemo/app/themes/001/V1/colors_and_fonts.json | |
| nemo/app/themes/001/V1/locales/en.yml | |
| nemo/app/themes/001/V1/locales/es.yml | |
| nemo/app/themes/001/V1/locales/gf.yml | |
| nemo/app/themes/001/V1/locales/ps.yml | |
| nemo/app/themes/001/V1/locales/pz.yml | |
| nemo/app/themes/001/V1/settings.json | |
| nemo/app/themes/002/V1/assets/images/thumb_large.png | |
| nemo/app/themes/002/V1/colors_and_fonts.json | |
| nemo/app/themes/002/V1/locales/en.yml | |
| nemo/app/themes/002/V1/locales/es.yml | |
| nemo/app/themes/002/V1/locales/gf.yml | |
| nemo/app/themes/002/V1/locales/ps.yml | |
| nemo/app/themes/002/V1/locales/pz.yml | |
| nemo/app/themes/002/V1/settings.json | |
| nemo/app/themes/003/V1/assets/images/thumb_large.png | |
| nemo/app/themes/003/V1/colors_and_fonts.json | |
| nemo/app/themes/003/V1/locales/en.yml | |
| nemo/app/themes/003/V1/locales/es.yml | |
| nemo/app/themes/003/V1/locales/gf.yml | |
| nemo/app/themes/003/V1/locales/ps.yml | |
| nemo/app/themes/003/V1/locales/pz.yml | |
| nemo/app/themes/003/V1/settings.json | |
| nemo/app/themes/004/V1/assets/images/thumb_large.png | |
| nemo/app/themes/004/V1/colors_and_fonts.json | |
| nemo/app/themes/004/V1/settings.json | |
| nemo/app/themes/005/V1/assets/images/thumb_large.png | |
| nemo/app/themes/005/V1/colors_and_fonts.json | |
| nemo/app/themes/005/V1/settings.json | |
| nemo/app/themes/006/V1/assets/images/thumb_large.png | |
| nemo/app/themes/006/V1/colors_and_fonts.json | |
| nemo/app/themes/006/V1/locales/en.yml | |
| nemo/app/themes/006/V1/locales/es.yml | |
| nemo/app/themes/006/V1/locales/gf.yml | |
| nemo/app/themes/006/V1/locales/ps.yml | |
| nemo/app/themes/006/V1/locales/pz.yml | |
| nemo/app/themes/006/V1/settings.json | |
| nemo/app/themes/007/V1/assets/dark/stylesheets/style.css | |
| nemo/app/themes/007/V1/assets/stylesheets/style.css | |
| nemo/app/themes/007/V1/assets_resources/theme-variables.less | |
| nemo/app/themes/007/V1/assets_resources/theme.less | |
| nemo/app/themes/007/V1/colors_and_fonts.json | |
| nemo/app/themes/007/V1/settings.json | |
| nemo/app/themes/008/V1/assets/images/thumb_large.png | |
| nemo/app/themes/008/V1/colors_and_fonts.json | |
| nemo/app/themes/008/V1/locales/en.yml | |
| nemo/app/themes/008/V1/locales/es.yml | |
| nemo/app/themes/008/V1/locales/gf.yml | |
| nemo/app/themes/008/V1/locales/ps.yml | |
| nemo/app/themes/008/V1/locales/pz.yml | |
| nemo/app/themes/008/V1/settings.json | |
| nemo/app/themes/009/V1/assets/images/thumb_large.png | |
| nemo/app/themes/009/V1/colors_and_fonts.json | |
| nemo/app/themes/009/V1/locales/en.yml | |
| nemo/app/themes/009/V1/locales/es.yml | |
| nemo/app/themes/009/V1/locales/gf.yml | |
| nemo/app/themes/009/V1/locales/ps.yml | |
| nemo/app/themes/009/V1/locales/pz.yml | |
| nemo/app/themes/009/V1/settings.json | |
| nemo/app/themes/010/V1/assets/images/thumb_large.png | |
| nemo/app/themes/010/V1/colors_and_fonts.json | |
| nemo/app/themes/010/V1/settings.json | |
| nemo/app/themes/011/V1/colors_and_fonts.json | |
| nemo/app/themes/011/V1/locales/en.yml | |
| nemo/app/themes/011/V1/locales/es.yml | |
| nemo/app/themes/011/V1/locales/gf.yml | |
| nemo/app/themes/011/V1/locales/ps.yml | |
| nemo/app/themes/011/V1/locales/pz.yml | |
| nemo/app/themes/011/V1/settings.json | |
| nemo/app/themes/012/V1/assets/images/thumb_large.png | |
| nemo/app/themes/012/V1/colors_and_fonts.json | |
| nemo/app/themes/012/V1/settings.json | |
| nemo/app/themes/013/V1/assets/images/thumb_large.png | |
| nemo/app/themes/013/V1/colors_and_fonts.json | |
| nemo/app/themes/013/V1/locales/en.yml | |
| nemo/app/themes/013/V1/locales/es.yml | |
| nemo/app/themes/013/V1/locales/gf.yml | |
| nemo/app/themes/013/V1/locales/ps.yml | |
| nemo/app/themes/013/V1/locales/pz.yml | |
| nemo/app/themes/013/V1/settings.json | |
| nemo/app/themes/014/V1/assets/blue/stylesheets/style.css | |
| nemo/app/themes/014/V1/assets/stylesheets/style.css | |
| nemo/app/themes/014/V1/assets_resources/theme.less | |
| nemo/app/themes/014/V1/colors_and_fonts.json | |
| nemo/app/themes/014/V1/locales/en.yml | |
| nemo/app/themes/014/V1/locales/es.yml | |
| nemo/app/themes/014/V1/locales/gf.yml | |
| nemo/app/themes/014/V1/locales/ps.yml | |
| nemo/app/themes/014/V1/locales/pz.yml | |
| nemo/app/themes/014/V1/settings.json | |
| nemo/app/themes/015/V1/assets/images/thumb_large.png | |
| nemo/app/themes/015/V1/assets/stylesheets/style.css | |
| nemo/app/themes/015/V1/assets_resources/theme.less | |
| nemo/app/themes/015/V1/colors_and_fonts.json | |
| nemo/app/themes/015/V1/locales/en.yml | |
| nemo/app/themes/015/V1/locales/es.yml | |
| nemo/app/themes/015/V1/locales/gf.yml | |
| nemo/app/themes/015/V1/locales/ps.yml | |
| nemo/app/themes/015/V1/locales/pz.yml | |
| nemo/app/themes/015/V1/settings.json | |
| nemo/app/themes/016/V1/colors_and_fonts.json | |
| nemo/app/themes/016/V1/locales/en.yml | |
| nemo/app/themes/016/V1/locales/es.yml | |
| nemo/app/themes/016/V1/locales/gf.yml | |
| nemo/app/themes/016/V1/locales/ps.yml | |
| nemo/app/themes/016/V1/locales/pz.yml | |
| nemo/app/themes/016/V1/locales/sv.yml | |
| nemo/app/themes/016/V1/settings.json | |
| nemo/app/themes/017/V1/colors_and_fonts.json | |
| nemo/app/themes/017/V1/settings.json | |
| nemo/app/themes/__master/locales/en.yml | |
| nemo/app/themes/__master/locales/es.yml | |
| nemo/app/themes/__master/locales/gf.yml | |
| nemo/app/themes/__master/locales/ps.yml | |
| nemo/app/themes/__master/locales/pz.yml | |
| nemo/app/themes/__master/locales/qa.yml | |
| nemo/app/themes/__master/locales/sv.yml | |
| nemo/app/themes/__master/manifest.json | |
| nemo/app/themes/__master/settings.json | |
| nemo/app/themes/__master/snippets/checkout_summary_sidebar.liquid | |
| nemo/app/themes/__master/snippets/invoice.liquid | |
| nemo/app/themes/__master/snippets/order_email.html.liquid | |
| nemo/app/themes/__master/snippets/order_email.text.liquid | |
| nemo/app/themes/__master/snippets/theme_preview.liquid | |
| nemo/app/themes/test/V1/colors_and_fonts.json | |
| nemo/app/themes/test/V1/settings.json | |
| nemo/app/themes/test_hero/V1/colors_and_fonts.json | |
| nemo/app/themes/test_hero/V1/settings.json | |
| nemo/config/application.rb | |
| nemo/config/environments/development.rb | |
| nemo/config/environments/nemo_dev.rb | |
| nemo/config/environments/nemo_test.rb | |
| nemo/config/environments/production.rb | |
| nemo/config/environments/staging.rb | |
| nemo/config/environments/test.rb | |
| nemo/config/initializers/environment_agnostic_config.rb | |
| nemo/config/locales/devise.es.yml | |
| nemo/config/locales/devise.gf.yml | |
| nemo/config/locales/devise.ps.yml | |
| nemo/config/locales/devise.pz.yml | |
| nemo/config/locales/gf.yml | |
| nemo/config/locales/ps.yml | |
| nemo/config/locales/pz.yml | |
| nemo/config/routes.rb | |
| nemo/db/schema_common.rb | |
| nemo/lib/nemo/middleware/new_relic.rb | |
| nemo_core/app/models/nemo_core/database_server.rb | |
| nemo_core/app/models/nemo_core/hosting_cluster.rb | |
| nemo_core/app/models/nemo_core/site_account.rb | |
| nemo_core/config/locales/es.yml | |
| nemo_core/config/locales/gf.yml | |
| nemo_core/config/locales/ps.yml | |
| nemo_core/config/locales/pz.yml | |
| nemo_core/lib/nemo_core/config/configuration.rb | |
| nemo_core/lib/nemo_core/validation/csv_file_validator.rb | |
| nemo_core/spec/lib/nemo_core/request_store_spec.rb | |
| nemo_core/spec/spec_helper.rb | |
| nemo_qa/lib/common/constants.rb | |
| nemo_qa/lib/common/email.rb | |
| nemo_qa/lib/common/javascript_connector.rb | |
| nemo_qa/lib/common/nemoqa_config.rb | |
| nemo_qa/lib/common/webdriver_connector.rb | |
| nemo_qa/spec/helpers/admin/admin_bizinfo_helper.rb | |
| nemo_qa/spec/helpers/admin/admin_categories_helper.rb | |
| nemo_qa/spec/helpers/admin/admin_common_helper.rb | |
| nemo_qa/spec/helpers/admin/admin_gem_helper.rb | |
| nemo_qa/spec/helpers/admin/admin_payment_method_helper.rb | |
| nemo_qa/spec/helpers/admin/admin_product_options_helper.rb | |
| nemo_qa/spec/helpers/admin/admin_products_helper.rb | |
| nemo_qa/spec/helpers/admin/admin_promotes_and_coupon_helper.rb | |
| nemo_qa/spec/helpers/admin/admin_shipping_and_tax_helper.rb | |
| nemo_qa/spec/helpers/common/i18n_helper.rb | |
| nemo_qa/spec/helpers/storefront_helper.rb | |
| nemo_qa/spec/pageobjects/admin/admin_coupons.rb | |
| nemo_qa/spec/pageobjects/admin/admin_dialog.rb | |
| nemo_qa/spec/pageobjects/admin/admin_order_details.rb | |
| nemo_qa/spec/pageobjects/admin/admin_payment_methods.rb | |
| nemo_qa/spec/pageobjects/admin/admin_product.rb | |
| nemo_qa/spec/pageobjects/admin/admin_product_options.rb | |
| nemo_qa/spec/pageobjects/admin/admin_promotes_store.rb | |
| nemo_qa/spec/pageobjects/admin/admin_shipping_methods.rb | |
| nemo_qa/spec/pageobjects/admin/admin_tax_settings.rb | |
| nemo_qa/spec/regression/admin/design/custom_pages_spec.rb | |
| nemo_qa/spec/regression/admin/design/sitewide_settings_spec.rb | |
| nemo_qa/spec/regression/admin/design/theme_settings_spec.rb | |
| nemo_qa/spec/regression/admin/i18n/australia_spec.rb | |
| nemo_qa/spec/regression/admin/i18n/india_ccavenue_spec.rb | |
| nemo_qa/spec/regression/admin/i18n/other_countries_spec.rb | |
| nemo_qa/spec/regression/admin/orders/custom_payment_and_paypal_order_spec.rb | |
| nemo_qa/spec/regression/admin/orders/order_history_and_recent_orders_spec.rb | |
| nemo_qa/spec/regression/admin/orders/place_order_and_fulfill_spec.rb | |
| nemo_qa/spec/regression/admin/product/add_and_edit_spec.rb | |
| nemo_qa/spec/regression/admin/product/bulk_import_spec.rb | |
| nemo_qa/spec/regression/admin/product/categories_spec.rb | |
| nemo_qa/spec/regression/admin/product/featured_and_product_list_spec.rb | |
| nemo_qa/spec/regression/admin/product/product_error_messages_spec.rb | |
| nemo_qa/spec/regression/admin/product/sale_price_spec.rb | |
| nemo_qa/spec/regression/admin/product_options/checkout_with_option_spec.rb | |
| nemo_qa/spec/regression/admin/product_options/choice_option_spec.rb | |
| nemo_qa/spec/regression/admin/product_options/order_personalized_product_spec.rb | |
| nemo_qa/spec/regression/admin/product_options/textbox_option_spec.rb | |
| nemo_qa/spec/regression/admin/promote/coupons/apply_best_value_coupon_spec.rb | |
| nemo_qa/spec/regression/admin/promote/coupons/coupon_error_messages_spec.rb | |
| nemo_qa/spec/regression/admin/promote/coupons/order_with_coupon_using_paypal_and_cc_spec.rb | |
| nemo_qa/spec/regression/admin/promote/promote_email_signups_spec.rb | |
| nemo_qa/spec/regression/admin/promote/promote_store_spec.rb | |
| nemo_qa/spec/regression/admin/settings/bizinfo/biz_info_and_domain_spec.rb | |
| nemo_qa/spec/regression/admin/settings/payment_methods_spec.rb | |
| nemo_qa/spec/regression/admin/settings/shipping/flat_rate_shipping_spec.rb | |
| nemo_qa/spec/regression/admin/settings/shipping/weight_based_shipping_spec.rb | |
| nemo_qa/spec/regression/admin/settings/tax/add_edit_validate_tax_method_spec.rb | |
| nemo_qa/spec/regression/admin/settings/tax/tax_price_and_checkout_flow_spec.rb | |
| nemo_qa/spec/regression/spree_api/spree_api_products_spec.rb | |
| nemo_qa/spec/regression/storefront/sf_bill_ship_payment_page_spec.rb | |
| nemo_qa/spec/regression/storefront/sf_per_item_shipping_payment_page_spec.rb | |
| nemo_qa/spec/uilocators/admin/admin_business_info.yml | |
| nemo_qa/spec/uilocators/admin/admin_order_details.yml | |
| nemo_qa/spec/uilocators/admin/admin_store_pages.yml | |
| nemo_qa/spec/uilocators/admin/admin_tax_settings.yml | |
| nemo_spree/backend/Rakefile | |
| nemo_spree/backend/app/assets/javascripts/admin/application/jquery.nemo.modal.js.erb | |
| nemo_spree/backend/app/assets/javascripts/admin/application/jquery.nemoconfirm.js.erb | |
| nemo_spree/backend/app/assets/javascripts/admin/application/nemo_confirm.js.erb | |
| nemo_spree/backend/app/assets/javascripts/admin/application/nemo_imageuploader.js.erb | |
| nemo_spree/backend/app/assets/javascripts/admin/application/nemo_show_form_dialog.js.erb | |
| nemo_spree/backend/app/assets/javascripts/admin/lib/nv.d3.min.js | |
| nemo_spree/backend/app/assets/javascripts/admin/lib/summernote.nemo.js.erb | |
| nemo_spree/backend/app/assets/javascripts/admin/react/products/option_item_list.js.jsx | |
| nemo_spree/backend/app/assets/javascripts/admin/react/products/option_item_text.js.jsx | |
| nemo_spree/backend/app/assets/javascripts/admin/react/products/options_grid_variant.js.jsx | |
| nemo_spree/backend/app/assets/javascripts/admin/react/shared/switch.js.jsx | |
| nemo_spree/backend/app/assets/javascripts/admin/react/shared/tooltip.js.jsx | |
| nemo_spree/backend/app/assets/stylesheets/admin/nemo_add_ons.scss | |
| nemo_spree/backend/app/assets/stylesheets/admin/nemo_onboarding.scss | |
| nemo_spree/backend/app/assets/stylesheets/admin/nemo_options_react.scss | |
| nemo_spree/backend/app/assets/stylesheets/admin/nemo_orders.scss | |
| nemo_spree/backend/app/assets/stylesheets/admin/nemo_payments.scss | |
| nemo_spree/backend/app/assets/stylesheets/admin/nemo_spree_backend.css | |
| nemo_spree/backend/app/assets/stylesheets/admin/nemo_switch.scss | |
| nemo_spree/backend/app/assets/stylesheets/admin/nemo_themes.scss | |
| nemo_spree/backend/app/controllers/spree/admin/base_controller_decorator.rb | |
| nemo_spree/backend/app/controllers/spree/admin/bulk_uploads_controller.rb | |
| nemo_spree/backend/app/controllers/spree/admin/general_settings_controller_decorator.rb | |
| nemo_spree/backend/app/controllers/spree/admin/mcafee_controller.rb | |
| nemo_spree/backend/app/controllers/spree/admin/onboarding_controller.rb | |
| nemo_spree/backend/app/controllers/spree/admin/setup_controller.rb | |
| nemo_spree/backend/app/controllers/spree/admin/tax_rates_controller_decorator.rb | |
| nemo_spree/backend/app/controllers/spree/admin/themes_controller.rb | |
| nemo_spree/backend/app/helpers/spree/admin/base_helper_decorator.rb | |
| nemo_spree/backend/app/helpers/spree/admin/dashboard_helper.rb | |
| nemo_spree/backend/app/helpers/spree/admin/general_settings_helper.rb | |
| nemo_spree/backend/app/helpers/spree/admin/products_helper_decorator.rb | |
| nemo_spree/backend/app/helpers/spree/admin/promotions_helper.rb | |
| nemo_spree/backend/app/helpers/spree/admin/shipping_methods_helper.rb | |
| nemo_spree/backend/app/helpers/spree/admin/tax_rates_helper.rb | |
| nemo_spree/backend/app/helpers/spree/admin/themes_helper.rb | |
| nemo_spree/backend/app/models/nemo_spree_backend/store.rb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_account_list_poller.js.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_email_signup_disable.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_email_signup_setup.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_follow_buttons_disable.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_follow_buttons_setup.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_index.js.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_product_reviews.js.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_product_reviews_congrats.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_product_reviews_connect.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_product_reviews_disable.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_product_reviews_edit.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_product_reviews_edit_connect.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_product_reviews_setup.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_product_reviews_turn_on.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_sharing_disable.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_sharing_setup.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_social_shop_disable.html.erb | |
| nemo_spree/backend/app/views/spree/admin/add_ons/_social_shop_setup.html.erb | |
| nemo_spree/backend/app/views/spree/admin/dashboard/_graphs.js.erb | |
| nemo_spree/backend/app/views/spree/admin/dashboard/index.html.erb | |
| nemo_spree/backend/app/views/spree/admin/designs/_sitewide_form.html.erb | |
| nemo_spree/backend/app/views/spree/admin/designs/edit.html.erb | |
| nemo_spree/backend/app/views/spree/admin/general_settings/_domain.html.erb | |
| nemo_spree/backend/app/views/spree/admin/general_settings/_edit.js.erb | |
| nemo_spree/backend/app/views/spree/admin/general_settings/edit.html.erb | |
| nemo_spree/backend/app/views/spree/admin/onboarding/_modal.html.erb | |
| nemo_spree/backend/app/views/spree/admin/onboarding/_modal.js.erb | |
| nemo_spree/backend/app/views/spree/admin/orders/_order_list.html.erb | |
| nemo_spree/backend/app/views/spree/admin/orders/_shipment.html.erb | |
| nemo_spree/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb | |
| nemo_spree/backend/app/views/spree/admin/orders/_shipment_update.html.erb | |
| nemo_spree/backend/app/views/spree/admin/orders/index.html.erb | |
| nemo_spree/backend/app/views/spree/admin/orders/order/_adjustments.html.erb | |
| nemo_spree/backend/app/views/spree/admin/orders/order/_header.js.erb | |
| nemo_spree/backend/app/views/spree/admin/orders/order/_recent.html.erb | |
| nemo_spree/backend/app/views/spree/admin/orders/order/_shipping_info.html.erb | |
| nemo_spree/backend/app/views/spree/admin/orders/order/_summary.html.erb | |
| nemo_spree/backend/app/views/spree/admin/payment_methods/settings/_paypal.html.erb | |
| nemo_spree/backend/app/views/spree/admin/payment_methods/settings/_paypalexpress.html.erb | |
| nemo_spree/backend/app/views/spree/admin/products/_form.html.erb | |
| nemo_spree/backend/app/views/spree/admin/products/_form.js.erb | |
| nemo_spree/backend/app/views/spree/admin/products/_image_upload.js.erb | |
| nemo_spree/backend/app/views/spree/admin/products/index.html.erb | |
| nemo_spree/backend/app/views/spree/admin/promotions/_form.html.erb | |
| nemo_spree/backend/app/views/spree/admin/promotions/actions/_create_line_items.html.erb | |
| nemo_spree/backend/app/views/spree/admin/promotions/index.html.erb | |
| nemo_spree/backend/app/views/spree/admin/shared/_currency_input.html.erb | |
| nemo_spree/backend/app/views/spree/admin/shared/_javascript.html.erb | |
| nemo_spree/backend/app/views/spree/admin/shared/_translations.js.erb | |
| nemo_spree/backend/app/views/spree/admin/shipping_methods/_form_flat.html.erb | |
| nemo_spree/backend/app/views/spree/admin/shipping_methods/_form_free.html.erb | |
| nemo_spree/backend/app/views/spree/admin/shipping_methods/_templates.html.erb | |
| nemo_spree/backend/app/views/spree/admin/shipping_methods/_weight_grid.html.erb | |
| nemo_spree/backend/app/views/spree/admin/shippo/_shippo_modal.html.erb | |
| nemo_spree/backend/app/views/spree/admin/store_pages/_form.html.erb | |
| nemo_spree/backend/app/views/spree/admin/tax_rates/_form.html.erb | |
| nemo_spree/backend/app/views/spree/admin/taxons/_form.html.erb | |
| nemo_spree/backend/app/views/spree/admin/themes/_settings_switch.html.erb | |
| nemo_spree/backend/config/locales/en.yml | |
| nemo_spree/backend/config/locales/es.yml | |
| nemo_spree/backend/config/locales/gf.yml | |
| nemo_spree/backend/config/locales/ps.yml | |
| nemo_spree/backend/config/locales/pz.yml | |
| nemo_spree/backend/config/locales/qa.yml | |
| nemo_spree/backend/spec/assets/javascripts/admin/react/products-test.js | |
| nemo_spree/backend/spec/assets/javascripts/admin/react/shared/switch-test.js | |
| nemo_spree/backend/spec/controllers/spree/admin/general_settings_controller_spec.rb | |
| nemo_spree/backend/spec/controllers/spree/admin/onboarding_controller_spec.rb | |
| nemo_spree/backend/spec/controllers/spree/admin/promotions_controller_decorator_spec.rb | |
| nemo_spree/backend/spec/controllers/spree/admin/setup_controller_spec.rb | |
| nemo_spree/backend/spec/helpers/spree/admin/dashboard_helper_spec.rb | |
| nemo_spree/backend/spec/helpers/spree/admin/general_settings_helper_spec.rb | |
| nemo_spree/backend/spec/helpers/spree/admin/products_helper_spec.rb | |
| nemo_spree/backend/spec/helpers/spree/admin/promotions_helper_spec.rb | |
| nemo_spree/backend/spec/helpers/spree/admin/themes_helper_spec.rb | |
| nemo_spree/backend/spec/models/nemo_spree_backend/store_spec.rb | |
| nemo_spree/backend/spec/spec_helper.rb | |
| nemo_spree/core/app/mailers/nemo_spree_core/bulk_uploads_mailer.rb | |
| nemo_spree/core/app/models/nemo_spree_core/bulk_import_asset.rb | |
| nemo_spree/core/app/models/nemo_spree_core/flat_shipping_method_type.rb | |
| nemo_spree/core/app/models/nemo_spree_core/free_shipping_method_type.rb | |
| nemo_spree/core/app/models/nemo_spree_core/integration/yotpo_account_signup.rb | |
| nemo_spree/core/app/models/nemo_spree_core/product_csv_parser.rb | |
| nemo_spree/core/app/models/nemo_spree_core/product_helpers/product_builder.rb | |
| nemo_spree/core/app/models/nemo_spree_core/product_option.rb | |
| nemo_spree/core/app/models/nemo_spree_core/shipping_method_type.rb | |
| nemo_spree/core/app/models/nemo_spree_core/store_page/terms.rb | |
| nemo_spree/core/app/models/nemo_spree_core/themes/theme.rb | |
| nemo_spree/core/app/models/spree/calculator/promotion_flat_rate.rb | |
| nemo_spree/core/app/models/spree/calculator/shipping/flat_percent_item_total_decorator.rb | |
| nemo_spree/core/app/models/spree/calculator/shipping/flat_rate_decorator.rb | |
| nemo_spree/core/app/models/spree/calculator/shipping/price_sack_decorator.rb | |
| nemo_spree/core/app/models/spree/money_decorator.rb | |
| nemo_spree/core/app/models/spree/preferences/spree_preferences_decorator.rb | |
| nemo_spree/core/app/models/spree/promotion_decorator.rb | |
| nemo_spree/core/app/models/spree/tax_rate_decorator.rb | |
| nemo_spree/core/config/locales/en.yml | |
| nemo_spree/core/config/locales/es.yml | |
| nemo_spree/core/config/locales/gf.yml | |
| nemo_spree/core/config/locales/ps.yml | |
| nemo_spree/core/config/locales/pz.yml | |
| nemo_spree/core/config/locales/qa.yml | |
| nemo_spree/core/db/default/spree/canada_provinces.rb | |
| nemo_spree/core/db/default/spree/india_states.rb | |
| nemo_spree/core/lib/nemo_spree_core/configuration.rb | |
| nemo_spree/core/lib/nemo_spree_core/controller_helpers/common.rb | |
| nemo_spree/core/lib/nemo_spree_core/database/seeder.rb | |
| nemo_spree/core/lib/nemo_spree_core/gd_email/list_management.rb | |
| nemo_spree/core/lib/nemo_spree_core/jobs/locale_change.rb | |
| nemo_spree/core/lib/nemo_spree_core/listeners/locale_change_listener.rb | |
| nemo_spree/core/lib/nemo_spree_core/mailer_helpers/common.rb | |
| nemo_spree/core/lib/nemo_spree_core/testing_support/account_maintenance.rb | |
| nemo_spree/core/lib/nemo_spree_core/themes/filters/format.rb | |
| nemo_spree/core/lib/nemo_spree_core/themes/filters/translate.rb | |
| nemo_spree/core/lib/nemo_spree_core/themes/manifest_loader.rb | |
| nemo_spree/core/lib/nemo_spree_core/themes/utils.rb | |
| nemo_spree/core/spec/fixtures/themes/__master/locales/en.yml | |
| nemo_spree/core/spec/fixtures/themes/__master/locales/es.yml | |
| nemo_spree/core/spec/fixtures/themes/__master/locales/fr.yml | |
| nemo_spree/core/spec/fixtures/themes/__master/manifest.json | |
| nemo_spree/core/spec/fixtures/themes/__master/settings.json | |
| nemo_spree/core/spec/fixtures/themes/test/V1/colors_and_fonts.json | |
| nemo_spree/core/spec/fixtures/themes/test/V1/locales/en.yml | |
| nemo_spree/core/spec/fixtures/themes/test/V1/locales/es.yml | |
| nemo_spree/core/spec/fixtures/themes/test/V1/settings.json | |
| nemo_spree/core/spec/fixtures/themes/test2/V1/locales/es.yml | |
| nemo_spree/core/spec/lib/nemo_spree_core/bulk_upload_helpers/data_processor_spec.rb | |
| nemo_spree/core/spec/lib/nemo_spree_core/database/seeder_spec.rb | |
| nemo_spree/core/spec/lib/nemo_spree_core/gd_email/list_management_spec.rb | |
| nemo_spree/core/spec/lib/nemo_spree_core/jobs/locale_change_spec.rb | |
| nemo_spree/core/spec/lib/nemo_spree_core/themes/filters/format_spec.rb | |
| nemo_spree/core/spec/lib/nemo_spree_core/themes/filters/translate_spec.rb | |
| nemo_spree/core/spec/lib/nemo_spree_core/themes/manifest_loader_spec.rb | |
| nemo_spree/core/spec/lib/nemo_spree_core/themes/utils_spec.rb | |
| nemo_spree/core/spec/mailers/order_mailer_decorator_spec.rb | |
| nemo_spree/core/spec/mailers/shipment_mailer_decorator_spec.rb | |
| nemo_spree/core/spec/models/nemo_spree_core/product_helpers/product_builder_spec.rb | |
| nemo_spree/core/spec/models/nemo_spree_core/store_page_spec.rb | |
| nemo_spree/core/spec/models/spree/calculator/shipping/flat_percent_item_total_decorator_spec.rb | |
| nemo_spree/core/spec/models/spree/calculator/shipping/flat_rate_decorator_spec.rb | |
| nemo_spree/core/spec/models/spree/promotion_decorator_spec.rb | |
| nemo_spree/core/spec/test_app/config/environments/test.rb | |
| nemo_spree/frontend/app/controllers/spree/email_signup_controller.rb | |
| nemo_spree/frontend/app/controllers/spree/store_controller_decorator.rb | |
| nemo_spree/frontend/config/locales/en.yml | |
| nemo_spree/frontend/config/locales/es.yml | |
| nemo_spree/frontend/config/locales/gf.yml | |
| nemo_spree/frontend/config/locales/ps.yml | |
| nemo_spree/frontend/config/locales/pz.yml | |
| nemo_sso/config/routes.rb | |
| nemo_support/app/controllers/caches_controller.rb | |
| nemo_support/app/views/caches/index.html.erb | |
| nemo_support/app/views/site_accounts/index.html.erb | |
| nemo_support/config/environments/nemo_dev.rb | |
| nemo_support/config/environments/nemo_test.rb | |
| nemo_support/config/environments/production.rb | |
| nemo_support/config/locales/devise.es.yml | |
| nemo_support/config/locales/devise.gf.yml | |
| nemo_support/config/locales/devise.ps.yml | |
| nemo_support/config/locales/devise.pz.yml | |
| nemo_support/config/locales/gf.yml | |
| nemo_support/config/locales/ps.yml | |
| nemo_support/config/locales/pz.yml | |
| Please, commit your changes or stash them before you can merge. | |
| error: The following untracked working tree files would be overwritten by merge: | |
| nemo/app/models/footnotes/notes/server_note.rb | |
| nemo/app/models/footnotes/notes/site_account_note.rb | |
| nemo/app/themes/001/V1/locales/qa.yml | |
| nemo/app/themes/002/V1/locales/qa.yml | |
| nemo/app/themes/003/V1/locales/qa.yml | |
| nemo/app/themes/004/V1/locales/en.yml | |
| nemo/app/themes/004/V1/locales/es.yml | |
| nemo/app/themes/004/V1/locales/gf.yml | |
| nemo/app/themes/004/V1/locales/ps.yml | |
| nemo/app/themes/004/V1/locales/pz.yml | |
| nemo/app/themes/004/V1/locales/qa.yml | |
| nemo/app/themes/005/V1/locales/en.yml | |
| nemo/app/themes/005/V1/locales/es.yml | |
| nemo/app/themes/005/V1/locales/gf.yml | |
| nemo/app/themes/005/V1/locales/ps.yml | |
| nemo/app/themes/005/V1/locales/pz.yml | |
| nemo/app/themes/005/V1/locales/qa.yml | |
| nemo/app/themes/006/V1/locales/qa.yml | |
| nemo/app/themes/007/V1/locales/en.yml | |
| nemo/app/themes/007/V1/locales/es.yml | |
| nemo/app/themes/007/V1/locales/gf.yml | |
| nemo/app/themes/007/V1/locales/ps.yml | |
| nemo/app/themes/007/V1/locales/pz.yml | |
| nemo/app/themes/007/V1/locales/qa.yml | |
| nemo/app/themes/008/V1/locales/qa.yml | |
| nemo/app/themes/009/V1/locales/qa.yml | |
| nemo/app/themes/010/V1/locales/en.yml | |
| nemo/app/themes/010/V1/locales/es.yml | |
| nemo/app/themes/010/V1/locales/gf.yml | |
| nemo/app/themes/010/V1/locales/ps.yml | |
| nemo/app/themes/010/V1/locales/pz.yml | |
| nemo/app/themes/010/V1/locales/qa.yml | |
| nemo/app/themes/011/V1/locales/qa.yml | |
| nemo/app/themes/012/V1/locales/en.yml | |
| nemo/app/themes/012/V1/locales/es.yml | |
| nemo/app/themes/012/V1/locales/gf.yml | |
| nemo/app/themes/012/V1/locales/ps.yml | |
| nemo/app/themes/012/V1/locales/pz.yml | |
| nemo/app/themes/012/V1/locales/qa.yml | |
| nemo/app/themes/013/V1/locales/qa.yml | |
| nemo/app/themes/014/V1/locales/qa.yml | |
| nemo/app/themes/015/V1/locales/qa.yml | |
| nemo/app/themes/016/V1/locales/qa.yml | |
| nemo/app/themes/017/V1/locales/en.yml | |
| nemo/app/themes/017/V1/locales/es.yml | |
| nemo/app/themes/017/V1/locales/gf.yml | |
| nemo/app/themes/017/V1/locales/ps.yml | |
| nemo/app/themes/017/V1/locales/pz.yml | |
| nemo/app/themes/017/V1/locales/qa.yml | |
| nemo/app/themes/__master/locales/_.yml | |
| nemo/app/themes/test/V1/locales/en.yml | |
| nemo/app/themes/test/V1/locales/es.yml | |
| nemo/app/themes/test/V1/locales/gf.yml | |
| nemo/app/themes/test/V1/locales/ps.yml | |
| nemo/app/themes/test/V1/locales/pz.yml | |
| nemo/app/themes/test/V1/locales/qa.yml | |
| nemo/app/themes/test_hero/V1/locales/en.yml | |
| nemo/app/themes/test_hero/V1/locales/es.yml | |
| nemo/app/themes/test_hero/V1/locales/fr.yml | |
| nemo/app/themes/test_hero/V1/locales/gf.yml | |
| nemo/app/themes/test_hero/V1/locales/ps.yml | |
| nemo/app/themes/test_hero/V1/locales/pz.yml | |
| nemo/app/themes/test_hero/V1/locales/qa.yml | |
| nemo/config/initializers/active_shipping.rb | |
| nemo/config/initializers/rails_footnotes.rb | |
| nemo/config/locales/devise.qa.yml | |
| nemo/config/locales/qa.yml | |
| nemo/lib/nemo/middleware/honey_badger.rb | |
| nemo/lib/tasks/one_off/activate_feature_announcements.rake | |
| nemo/lib/tasks/one_off/enable_yotpo_en_only.rake | |
| nemo_core/config/locales/qa.yml | |
| nemo_qa/lib/assets/bulk_import_products_file.csv | |
| nemo_qa/spec/fixtures/products_template_file.csv | |
| nemo_spree/backend/app/assets/images/ess-es.png | |
| nemo_spree/backend/app/assets/images/follow_buttons-es.png | |
| nemo_spree/backend/app/assets/images/paypal-modal-img-es.png | |
| nemo_spree/backend/app/assets/images/product_review_setup_main-es.png | |
| nemo_spree/backend/app/assets/images/sharing-es.png | |
| nemo_spree/backend/app/assets/javascripts/admin/application/nemo_i18n.js.erb | |
| nemo_spree/backend/app/models/nemo_spree_backend/business_information.rb | |
| nemo_spree/backend/config/locales/_.yml | |
| nemo_spree/backend/config/locales/fr.yml | |
| nemo_spree/backend/spec/models/nemo_spree_backend/business_information_spec.rb | |
| nemo_spree/core/app/models/paypal/sdk/core/api/base_decorator.rb | |
| nemo_spree/core/app/models/spree/weight_based_calculator_rate_decorator.rb | |
| nemo_spree/core/config/locales/_.yml | |
| nemo_spree/core/lib/nemo_spree_core/i18n_helper.rb | |
| nemo_spree/core/lib/nemo_spree_core/themes/translator.rb | |
| nemo_spree/core/spec/fixtures/themes/__master/locales/_.yml | |
| nemo_spree/core/spec/fixtures/themes/test2/V1/locales/en.yml | |
| nemo_spree/core/spec/fixtures/themes/test2/V1/settings.json | |
| nemo_spree/core/spec/lib/nemo_spree_core/i18n_helper_spec.rb | |
| nemo_spree/frontend/config/locales/qa.yml | |
| nemo_support/app/views/caches/_form.html.erb | |
| nemo_support/config/locales/devise.fr.yml | |
| nemo_support/config/locales/devise.qa.yml | |
| nemo_support/config/locales/qa.yml | |
| Please move or remove them before you can merge. | |
| Aborting | |
| fatal: Cannot fast-forward your working tree. | |
| After making sure that you saved anything precious from | |
| $ git diff caeff76c17960adf7fc123a27b9e8a9f2d7205b7 | |
| output, run | |
| $ git reset --hard | |
| to recover. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment