conflicts html generation code to helpers

gistfile1.txt

[venkatab@pnwsdes053 redzone]$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: RZ-3594 - As a developer, I want to develop and implement a strategy for removing html generation code from models
Using index info to reconstruct a base tree...
<stdin>:83: trailing whitespace.
    ("On #{adjustment.created_at.to_s(:date)}, #{adjustment.user.name} changed #{adjustment.stat_column} from #{adjustment.formatted_original_value} to #{adjustment.formatted_value} for these dimensions: " + 
<stdin>:86: trailing whitespace.
  
<stdin>:182: trailing whitespace.
  
<stdin>:204: trailing whitespace.
  
<stdin>:208: trailing whitespace.
    
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging app/mailers/offer_mailer.rb
Auto-merging app/models/address.rb
CONFLICT (content): Merge conflict in app/models/address.rb
Auto-merging app/models/campaign_survey.rb
Auto-merging app/models/delivery_adjustment.rb
Auto-merging app/models/offer.rb
CONFLICT (content): Merge conflict in app/models/offer.rb
Auto-merging app/models/site_allocation.rb
Auto-merging app/models/wiki_page.rb
Auto-merging app/views/offer_mailer/offer.html.erb
Auto-merging app/views/offers/show.html.haml
Auto-merging spec/models/address_spec.rb
CONFLICT (content): Merge conflict in spec/models/address_spec.rb
Auto-merging spec/models/campaign_survey_spec.rb
CONFLICT (content): Merge conflict in spec/models/campaign_survey_spec.rb
Failed to merge in the changes.
Patch failed at 0001 RZ-3594 - As a developer, I want to develop and implement a strategy for removing html generation code from models

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".

[venkatab@pnwsdes053 redzone]$ git checkout --our app/models/address.rb
You have new mail in /var/spool/mail/venkatab
[venkatab@pnwsdes053 redzone]$ git checkout --our app/models/offer.rb
You have new mail in /var/spool/mail/venkatab
[venkatab@pnwsdes053 redzone]$ git checkout --our spec/models/address_spec.rb
You have new mail in /var/spool/mail/venkatab
[venkatab@pnwsdes053 redzone]$ git checkout --their spec/models/address_spec.rb
You have new mail in /var/spool/mail/venkatab
[venkatab@pnwsdes053 redzone]$ git checkout --our spec/models/address_spec.rb
[venkatab@pnwsdes053 redzone]$ git checkout --their spec/models/campaign_survey_spec.rb

warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging app/models/site_allocation.rb
CONFLICT (content): Merge conflict in app/models/site_allocation.rb
Auto-merging app/views/offer_mailer/offer.html.erb
Auto-merging app/views/offers/show.html.haml
Auto-merging app/views/site_allocations/edit.html.haml
CONFLICT (content): Merge conflict in app/views/site_allocations/edit.html.haml
Auto-merging spec/models/site_allocation_spec.rb
CONFLICT (content): Merge conflict in spec/models/site_allocation_spec.rb
Failed to merge in the changes.
Patch failed at 0002 RZ-3594 - As a developer, I want to develop and implement a strategy for removing html generation code from models

[venkatab@pnwsdes053 redzone]$ git checkout --our app/models/site_allocation.rb

[venkatab@pnwsdes053 redzone]$ git checkout --our app/views/site_allocations/edit.html.haml

[venkatab@pnwsdes053 redzone]$ git checkout --our spec/models/site_allocation_spec.rb