Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
RZ-3179 rebase
[venkatab@PNWSDES053 redzone]$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: RZ-3810 -- As a System, I should use Zendesk for all issue tracking.
Using index info to reconstruct a base tree...
<stdin>:260: trailing whitespace.
@search = Sunspot.search Department, Agency, Advertiser, Publisher, Campaign, Site, Zone, User, SalesRep, Company, Market, DeliveryReportTemplate do |query|
<stdin>:343: trailing whitespace.
:geo_target, :geo_target_group, :geo_target_group_geo_target, :global_config, :search_keyword,
<stdin>:1009: trailing whitespace.
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): Rename features/su_issues.feature->features/su/su_issues.feature in HEAD and deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking.
Auto-merging app/assets/javascripts/application.js
CONFLICT (content): Merge conflict in app/assets/javascripts/application.js
CONFLICT (delete/modify): app/controllers/issues_controller.rb deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of app/controllers/issues_controller.rb left in tree.
Auto-merging app/controllers/search_controller.rb
CONFLICT (content): Merge conflict in app/controllers/search_controller.rb
Removing app/mailers/issue_mailer.rb
Auto-merging app/models/ability.rb
Auto-merging app/models/attachment.rb
Auto-merging app/models/audit_observer.rb
Auto-merging app/models/comment.rb
CONFLICT (delete/modify): app/models/issue.rb deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of app/models/issue.rb left in tree.
Removing app/models/issue_state.rb
Auto-merging app/views/dashboard/index.html.haml
CONFLICT (content): Merge conflict in app/views/dashboard/index.html.haml
CONFLICT (delete/modify): app/views/issue_mailer/issue.text.erb deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of app/views/issue_mailer/issue.text.erb left in tree.
CONFLICT (delete/modify): app/views/issues/_attachment_fields.html.haml deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of app/views/issues/_attachment_fields.html.haml left in tree.
CONFLICT (delete/modify): app/views/issues/_attachments.html.haml deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of app/views/issues/_attachments.html.haml left in tree.
CONFLICT (delete/modify): app/views/issues/_comment.html.haml deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of app/views/issues/_comment.html.haml left in tree.
CONFLICT (delete/modify): app/views/issues/edit.html.haml deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of app/views/issues/edit.html.haml left in tree.
CONFLICT (delete/modify): app/views/issues/feedback.html.haml deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of app/views/issues/feedback.html.haml left in tree.
CONFLICT (delete/modify): app/views/issues/index.html.haml deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of app/views/issues/index.html.haml left in tree.
CONFLICT (delete/modify): app/views/issues/new.html.haml deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of app/views/issues/new.html.haml left in tree.
Auto-merging app/views/layouts/_side_tabs.html.haml
CONFLICT (content): Merge conflict in app/views/layouts/_side_tabs.html.haml
Auto-merging app/views/layouts/application.html.haml
CONFLICT (content): Merge conflict in app/views/layouts/application.html.haml
Auto-merging config/routes.rb
Removing features/step_definitions/issue_steps.rb
Removing lib/tasks/jira.rake
CONFLICT (delete/modify): spec/controllers/issues_controller_spec.rb deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of spec/controllers/issues_controller_spec.rb left in tree.
CONFLICT (delete/modify): spec/factories/issue.rb deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of spec/factories/issue.rb left in tree.
Auto-merging spec/integration/ability_spec.rb
CONFLICT (content): Merge conflict in spec/integration/ability_spec.rb
CONFLICT (delete/modify): spec/models/issue_mailer_spec.rb deleted in RZ-3810 -- As a System, I should use Zendesk for all issue tracking. and modified in HEAD. Version HEAD of spec/models/issue_mailer_spec.rb left in tree.
Removing spec/models/issue_state_spec.rb
Failed to merge in the changes.
Patch failed at 0001 RZ-3810 -- As a System, I should use Zendesk for all issue tracking.
@rubystar

This comment has been minimized.

Copy link
Owner Author

rubystar commented Sep 24, 2013

[venkatab@PNWSDES053 redzone]$ git checkout --our app/assets/javascripts/application.js
[venkatab@PNWSDES053 redzone]$ git checkout --our app/controllers/search_controller.rb
[venkatab@PNWSDES053 redzone]$ git checkout --our app/views/dashboard/index.html.haml
[venkatab@PNWSDES053 redzone]$ git checkout --our app/views/layouts/_side_tabs.html.haml
[venkatab@PNWSDES053 redzone]$ git checkout --our app/views/layouts/application.html.haml
[venkatab@PNWSDES053 redzone]$ git add .
[venkatab@PNWSDES053 redzone]$ git rebase --continue
Applying: RZ-3810 -- As a System, I should use Zendesk for all issue tracking.
Applying: Rz 3179 -- Support Tool: As a support user, I would like the error page to allow users to easily enter and submit a new issue
Using index info to reconstruct a base tree...
:66: trailing whitespace.

:92: trailing whitespace.

:118: trailing whitespace.

warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging app/views/layouts/_side_tabs.html.haml
CONFLICT (content): Merge conflict in app/views/layouts/_side_tabs.html.haml
Auto-merging app/views/layouts/application.html.haml
CONFLICT (content): Merge conflict in app/views/layouts/application.html.haml
Auto-merging public/500.html
Failed to merge in the changes.
Patch failed at 0002 Rz 3179 -- Support Tool: As a support user, I would like the error page to allow users to easily enter and submit a new issue

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
You can’t perform that action at this time.