Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Merge conflicts when rebased with latest master
sh-4.2$ git rebase master
It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr /home/local/PENNYWISE/sivaa/projects/redzone/.git/rebase-apply
and run me again. I am stopping in case you still have something
valuable there.
sh-4.2$ git rebase --abort
sh-4.2$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: RZ-3203 - As a developer, I want to migrate the remaining ERB views to HAML
Using index info to reconstruct a base tree...
<stdin>:790: trailing whitespace.
<stdin>:3118: trailing whitespace.
<stdin>:6212: trailing whitespace.
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
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 RZ-3203 - As a developer, I want to migrate the remaining ERB views to HAML 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/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 RZ-3203 - As a developer, I want to migrate the remaining ERB views to HAML 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 RZ-3203 - As a developer, I want to migrate the remaining ERB views to HAML 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 RZ-3203 - As a developer, I want to migrate the remaining ERB views to HAML 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 RZ-3203 - As a developer, I want to migrate the remaining ERB views to HAML 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 RZ-3203 - As a developer, I want to migrate the remaining ERB views to HAML 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 RZ-3203 - As a developer, I want to migrate the remaining ERB views to HAML 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 RZ-3203 - As a developer, I want to migrate the remaining ERB views to HAML 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/campaign_deployments/edit.html.erb
Removing app/views/campaign_deployments/_site.html.erb
Removing app/views/campaign_deployments/_select_ads.html.erb
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/_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/_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
Auto-merging app/helpers/application_helper.rb
Failed to merge in the changes.
Patch failed at 0001 RZ-3203 - As a developer, I want to migrate the remaining ERB views to HAML
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment