Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Conflicts when UI migration rebased with latest master till Jan 10th
sh-4.2$ git pull venkat RZ-3456
remote: Counting objects: 1779, done.
remote: Compressing objects: 100% (424/424), done.
remote: Total 1560 (delta 1118), reused 1493 (delta 1117)
Receiving objects: 100% (1560/1560), 306.38 KiB | 148 KiB/s, done.
Resolving deltas: 100% (1118/1118), completed with 151 local objects.
From github.com:venkatab/redzone
* branch RZ-3456 -> FETCH_HEAD
Removing spec/controllers/campaign_deployments_controller_spec.rb
Removing spec/controllers/ad_deployments_controller_spec.rb
Auto-merging features/su_user.feature
CONFLICT (content): Merge conflict in features/su_user.feature
CONFLICT (modify/delete): features/su_quickbooks_vendors.feature deleted in HEAD and modified in c29f6a919890b5ca0f3558b50307dc3f074006a7. Version c29f6a919890b5ca0f3558b50307dc3f074006a7 of features/su_quickbooks_vendors.feature left in tree.
CONFLICT (modify/delete): features/su_quickbooks_customers.feature deleted in HEAD and modified in c29f6a919890b5ca0f3558b50307dc3f074006a7. Version c29f6a919890b5ca0f3558b50307dc3f074006a7 of features/su_quickbooks_customers.feature left in tree.
Auto-merging features/su_publisher.feature
CONFLICT (content): Merge conflict in features/su_publisher.feature
Auto-merging features/su_payments.feature
CONFLICT (content): Merge conflict in features/su_payments.feature
Auto-merging features/su_order_ads.feature
Auto-merging features/su_media_plan_requests.feature
CONFLICT (content): Merge conflict in features/su_media_plan_requests.feature
Auto-merging features/su_invoice_templates.feature
Auto-merging features/su_delivery_reports.feature
CONFLICT (content): Merge conflict in features/su_delivery_reports.feature
Auto-merging features/su_company_sales_reps.feature
CONFLICT (content): Merge conflict in features/su_company_sales_reps.feature
Auto-merging features/su_campaign_surveys.feature
CONFLICT (content): Merge conflict in features/su_campaign_surveys.feature
Auto-merging features/su_campaign_site.feature
CONFLICT (modify/delete): features/su_campaign_deployment.feature deleted in c29f6a919890b5ca0f3558b50307dc3f074006a7 and modified in HEAD. Version HEAD of features/su_campaign_deployment.feature left in tree.
CONFLICT (modify/delete): features/su_campaign_comments.feature deleted in c29f6a919890b5ca0f3558b50307dc3f074006a7 and modified in HEAD. Version HEAD of features/su_campaign_comments.feature left in tree.
Auto-merging features/su_campaign_ads.feature
Auto-merging features/su_campaign_3rd_party_apis.feature
Auto-merging features/su_campaign.feature
CONFLICT (content): Merge conflict in features/su_campaign.feature
Removing features/su_advertiser_order_ad_deployment.feature
Auto-merging features/su_advertiser_order_ad_blocks.feature
Auto-merging features/step_definitions/campaign_steps.rb
CONFLICT (content): Merge conflict in features/step_definitions/campaign_steps.rb
Auto-merging features/sr_media_plan_requests.feature
CONFLICT (content): Merge conflict in features/sr_media_plan_requests.feature
Auto-merging features/sp_site_profiles.feature
Auto-merging features/publisher_site_offers.feature
Auto-merging features/nao_campaigns.feature
Auto-merging features/mp_publisher.feature
Auto-merging features/mp_media_plans.feature
Auto-merging features/mp_campaign_site.feature
CONFLICT (modify/delete): features/mp_campaign_comments.feature deleted in c29f6a919890b5ca0f3558b50307dc3f074006a7 and modified in HEAD. Version HEAD of features/mp_campaign_comments.feature left in tree.
Auto-merging features/mb_publisher_sites.feature
Auto-merging features/mb_campaign_site_allocations.feature
Removing features/mb_campaign_comments.feature
Auto-merging features/mb_campaign.feature
Auto-merging features/au_notices.feature
Auto-merging features/au_invoices.feature
CONFLICT (content): Merge conflict in features/au_invoices.feature
Auto-merging features/au_invoice_templates.feature
Auto-merging features/au_insertion_orders.feature
Auto-merging features/am_campaign_ads.feature
Auto-merging features/am_campaign.feature
Auto-merging config/routes.rb
Removing app/views/zones/show.html.erb
Removing app/views/zones/new.html.erb
Removing app/views/zones/edit.html.erb
Removing app/views/zones/_context.html.erb
Removing app/views/zone_groups/show.html.erb
Removing app/views/zone_groups/new.html.erb
Removing app/views/zone_groups/index.html.erb
Removing app/views/zone_groups/edit.html.erb
Removing app/views/zone_groups/_table.html.erb
Removing app/views/zone_groups/_context.html.erb
Removing app/views/wiki_pages/show.html.erb
Removing app/views/wiki_pages/new.html.erb
Removing app/views/wiki_pages/index.html.erb
Removing app/views/wiki_pages/edit.html.erb
Removing app/views/wiki_pages/_wiki_page.html.erb
Removing app/views/wiki_pages/_form.html.erb
Removing app/views/wiki_pages/_context.html.erb
Removing app/views/users/new.html.erb
Removing app/views/users/edit.html.erb
Removing app/views/users/_signup_form.html.erb
CONFLICT (modify/delete): app/views/users/_context.html.erb deleted in c29f6a919890b5ca0f3558b50307dc3f074006a7 and modified in HEAD. Version HEAD of app/views/users/_context.html.erb left in tree.
Removing app/views/trackers/new.html.erb
Removing app/views/trackers/index.html.erb
Removing app/views/trackers/edit.html.erb
Removing app/views/trackers/_context.html.erb
Removing app/views/static/help.html.erb
Removing app/views/static/_profile_help.html.erb
Removing app/views/static/_login_help.html.erb
Removing app/views/sites/tags.html.erb
Removing app/views/sites/new.html.erb
Removing app/views/sites/_search.html.erb
Removing app/views/sites/_form.html.erb
Removing app/views/sites/_context.html.erb
Removing app/views/site_allocations/_table.html.erb
Removing app/views/site_allocations/_readonly_table.html.haml
Removing app/views/sessions/new.html.erb
Removing app/views/sales_reps/show.html.erb
Removing app/views/sales_reps/new.html.erb
Removing app/views/sales_reps/edit.html.erb
Removing app/views/sales_reps/_context.html.erb
Removing app/views/receivables/new.html.erb
Removing app/views/receivables/index.html.erb
Removing app/views/receivables/edit.html.erb
Removing app/views/receivables/_table.html.erb
Removing app/views/receivables/_form.html.erb
Removing app/views/receivables/_context.html.erb
Removing app/views/quickbooks_vendors/index.html.erb
Removing app/views/quickbooks_vendors/_vendors.html.erb
Removing app/views/quickbooks_customers/index.html.erb
Removing app/views/quickbooks_customers/_customers.html.erb
Removing app/views/publishers/new.html.erb
Removing app/views/publishers/index.html.erb
Removing app/views/publishers/edit.html.erb
Removing app/views/profiles/_context.html.erb
Removing app/views/products/show.html.erb
Removing app/views/products/edit.html.erb
Removing app/views/payables/show.html.erb
Removing app/views/payables/new.html.erb
Removing app/views/payables/index.html.erb
Removing app/views/payables/edit.html.erb
Removing app/views/payables/_form.html.erb
Removing app/views/payables/_context.html.erb
Removing app/views/payable_line_items/_payable_line_item.html.erb
Removing app/views/orders/tags.html.erb
Removing app/views/orders/show.html.erb
Removing app/views/orders/new.html.erb
Removing app/views/orders/_context.html.erb
Removing app/views/offer_mailer/tags_ready.html.erb
Removing app/views/offer_mailer/status_update.html.erb
Removing app/views/offer_mailer/po.html.erb
Removing app/views/offer_mailer/offer.html.erb
Removing app/views/notifications/index.html.erb
Removing app/views/neuron_trackers/show.html.erb
Removing app/views/neuron_trackers/new.html.erb
Removing app/views/neuron_trackers/edit.html.erb
Removing app/views/neuron_trackers/_context.html.erb
Removing app/views/media_plans/new.html.erb
Removing app/views/media_plans/index.html.erb
Removing app/views/media_plans/_media_plan.html.erb
Auto-merging app/views/media_plans/_context.html.haml
Removing app/views/media_plan_requests/_context.html.erb
CONFLICT (modify/delete): app/views/media_plan_mailer/status_change_notification.html.erb deleted in c29f6a919890b5ca0f3558b50307dc3f074006a7 and modified in HEAD. Version HEAD of app/views/media_plan_mailer/status_change_notification.html.erb left in tree.
CONFLICT (modify/delete): app/views/media_plan_mailer/new_notification.html.erb deleted in c29f6a919890b5ca0f3558b50307dc3f074006a7 and modified in HEAD. Version HEAD of app/views/media_plan_mailer/new_notification.html.erb left in tree.
CONFLICT (modify/delete): app/views/media_plan_mailer/complete_notification.html.erb deleted in c29f6a919890b5ca0f3558b50307dc3f074006a7 and modified in HEAD. Version HEAD of app/views/media_plan_mailer/complete_notification.html.erb left in tree.
CONFLICT (modify/delete): app/views/media_plan_mailer/change_notification.html.erb deleted in c29f6a919890b5ca0f3558b50307dc3f074006a7 and modified in HEAD. Version HEAD of app/views/media_plan_mailer/change_notification.html.erb left in tree.
CONFLICT (modify/delete): app/views/media_plan_mailer/assigned_notification.html.erb deleted in c29f6a919890b5ca0f3558b50307dc3f074006a7 and modified in HEAD. Version HEAD of app/views/media_plan_mailer/assigned_notification.html.erb left in tree.
Removing app/views/markets/index.html.erb
Removing app/views/leads/show.html.erb
Removing app/views/leads/new.html.erb
Removing app/views/leads/index.html.erb
Removing app/views/leads/edit.html.erb
Removing app/views/leads/_table.html.erb
Removing app/views/leads/_context.html.erb
Removing app/views/lead_trackers/show.html.erb
Removing app/views/lead_trackers/new.html.erb
Removing app/views/lead_trackers/index.html.erb
Removing app/views/lead_trackers/edit.html.erb
Removing app/views/lead_trackers/_table.html.erb
Removing app/views/layouts/_search.html.erb
Removing app/views/layouts/_month_select.html.erb
Removing app/views/jobs/show.html.erb
Removing app/views/jobs/index.html.erb
Removing app/views/jobs/_context.html.erb
Removing app/views/geo_targets/index.html.erb
Removing app/views/departments/show.html.erb
Removing app/views/departments/index.html.erb
Removing app/views/departments/edit.html.erb
Removing app/views/departments/_context.html.erb
Removing app/views/delivery_reports/run.html.erb
Removing app/views/delivery_reports/new.html.erb
Removing app/views/delivery_reports/index.html.erb
Removing app/views/delivery_reports/edit.html.erb
Removing app/views/delivery_reports/_table.html.erb
Removing app/views/delivery_reports/_report.html.erb
Removing app/views/delivery_reports/_context.html.erb
Removing app/views/delivery_report_templates/show.html.erb
Removing app/views/delivery_report_templates/new.html.erb
Removing app/views/delivery_report_templates/index.html.erb
Removing app/views/delivery_report_templates/edit.html.erb
Removing app/views/delivery_report_templates/_table.html.erb
Removing app/views/delivery_report_templates/_context.html.erb
CONFLICT (modify/delete): app/views/delivery_report_mailer/report.html.erb deleted in c29f6a919890b5ca0f3558b50307dc3f074006a7 and modified in HEAD. Version HEAD of app/views/delivery_report_mailer/report.html.erb left in tree.
CONFLICT (modify/delete): app/views/delivery_report_mailer/on_demand_report.html.erb deleted in c29f6a919890b5ca0f3558b50307dc3f074006a7 and modified in HEAD. Version HEAD of app/views/delivery_report_mailer/on_demand_report.html.erb left in tree.
Removing app/views/dart_trackers/_context.html.erb
Removing app/views/creatives/show.html.erb
Removing app/views/creatives/index.html.erb
Removing app/views/creatives/edit.html.erb
Removing app/views/creatives/_table.html.erb
Removing app/views/creatives/_context.html.erb
Removing app/views/companies/show.html.erb
Removing app/views/companies/new.html.erb
Removing app/views/companies/index.html.erb
Removing app/views/companies/edit.html.erb
Removing app/views/companies/_table.html.erb
Removing app/views/companies/_context.html.erb
Removing app/views/campaigns/index.html.erb
Removing app/views/campaigns/_sparkline.html.erb
Removing app/views/campaigns/_comments.html.haml
Auto-merging app/views/campaign_surveys/show.html.haml
CONFLICT (content): Merge conflict in app/views/campaign_surveys/show.html.haml
Removing app/views/campaign_sites/_readonly_table.html.haml
Removing app/views/campaign_deployments/show.html.haml
Removing app/views/campaign_deployments/edit.html.erb
Removing app/views/campaign_deployments/_site.html.erb
Removing app/views/campaign_deployments/_select_sites.html.haml
Removing app/views/campaign_deployments/_select_ads.html.erb
Removing app/views/campaign_deployments/_form.html.haml
Removing app/views/budget_allocations/new.html.erb
Removing app/views/budget_allocations/index.html.erb
Removing app/views/budget_allocations/edit.html.erb
Removing app/views/budget_allocations/_performance.html.haml
Removing app/views/budget_allocations/_context.html.erb
Removing app/views/blocks/show.html.erb
Removing app/views/blocks/new.html.erb
Removing app/views/blocks/index.html.erb
Removing app/views/blocks/edit.html.erb
Removing app/views/blocks/_table.html.erb
Removing app/views/blocks/_context.html.erb
Removing app/views/blocks/_available_zones.html.erb
Removing app/views/announcements/show.html.erb
Removing app/views/announcements/new.html.erb
Removing app/views/announcements/index.html.erb
Removing app/views/announcements/edit.html.erb
Removing app/views/announcements/_table.html.erb
Removing app/views/announcements/_context.html.erb
Removing app/views/advertisers/edit.html.erb
Removing app/views/advertisers/_sparkline.html.erb
Removing app/views/advertisers/_context.html.erb
Removing app/views/ads/new.html.erb
Removing app/views/ads/index.html.erb
Removing app/views/ads/edit.html.erb
Removing app/views/ads/_table.html.erb
Removing app/views/ads/_event_tracker_fields.html.haml
Removing app/views/ads/_context.html.erb
Removing app/views/ad_groups/show.html.erb
Removing app/views/ad_groups/new.html.erb
Removing app/views/ad_groups/index.html.erb
Removing app/views/ad_groups/edit.html.erb
Removing app/views/ad_groups/_table.html.erb
Removing app/views/ad_groups/_context.html.erb
Removing app/views/ad_deployments/show.html.erb
Removing app/views/ad_deployments/edit.html.erb
Removing app/views/ad_deployments/_select_zones.html.erb
Removing app/views/ad_deployments/_select_sites.html.haml
Removing app/views/ad_deployments/_form.html.haml
Removing app/models/campaign_comment.rb
Auto-merging app/helpers/application_helper.rb
Removing app/controllers/campaign_deployments_controller.rb
Removing app/controllers/ad_deployments_controller.rb
Removing app/assets/stylesheets/all/jquery-ui.css
Removing app/assets/stylesheets/all/formtastic.css
Removing app/assets/stylesheets/all/application.scss
Removing app/assets/javascripts/controllers/campaign_deployments.js
Removing app/assets/javascripts/controllers/ad_deployments.js
Removing app/assets/images/site_status_bg.png
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Automatic merge failed; fix conflicts and then commit the result.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment