broadway:SharesPost danyoder$ git checkout controls
Switched to branch 'controls'
broadway:SharesPost danyoder$ git merge l2
Auto-merging app/controllers/asks_controller.rb
CONFLICT (content): Merge conflict in app/controllers/asks_controller.rb
Auto-merging app/controllers/bids_controller.rb
CONFLICT (content): Merge conflict in app/controllers/bids_controller.rb
Auto-merging app/controllers/orders_controller.rb
Auto-merging app/models/ask.rb
CONFLICT (content): Merge conflict in app/models/ask.rb
Auto-merging app/models/bid.rb
CONFLICT (content): Merge conflict in app/models/bid.rb
Auto-merging app/models/company.rb
CONFLICT (content): Merge conflict in app/models/company.rb
Auto-merging app/models/company_sweeper.rb
Auto-merging app/models/order.rb
CONFLICT (content): Merge conflict in app/models/order.rb
Auto-merging app/views/asks/new.html.haml
CONFLICT (content): Merge conflict in app/views/asks/new.html.haml
Auto-merging app/views/bids/new.html.haml
CONFLICT (content): Merge conflict in app/views/bids/new.html.haml
Auto-merging config/locales/en.yml
CONFLICT (content): Merge conflict in config/locales/en.yml
Removing db/migrate/20090625000358_add_controls_to_company.rb
Removing db/migrate/20090625233314_add_roles_to_order.rb
Automatic merge failed; fix conflicts and then commit the result.
broadway:SharesPost danyoder$ git status
app/controllers/asks_controller.rb: needs merge
app/controllers/bids_controller.rb: needs merge
app/models/ask.rb: needs merge
app/models/bid.rb: needs merge
app/models/company.rb: needs merge
app/models/order.rb: needs merge
app/views/asks/new.html.haml: needs merge
app/views/bids/new.html.haml: needs merge
config/locales/en.yml: needs merge
# On branch controls
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   app/controllers/admin/emails_controller.rb
#	modified:   app/controllers/companies_controller.rb
#	modified:   app/controllers/orders_controller.rb
#	modified:   app/controllers/pages_controller.rb
#	modified:   app/controllers/sessions_controller.rb
#	modified:   app/controllers/trades_controller.rb
#	modified:   app/controllers/users_controller.rb
#	modified:   app/models/account.rb
#	modified:   app/models/company_sweeper.rb
#	modified:   app/models/order_mailer.rb
#	modified:   app/models/subscription_mailer.rb
#	modified:   app/models/trade.rb
#	modified:   app/models/trade_mailer.rb
#	modified:   app/models/user.rb
#	modified:   app/views/bids/_trade.html.haml
#	modified:   app/views/companies/_sorted_table.haml
#	modified:   app/views/companies/_table.html.haml
#	modified:   app/views/companies/_table_4visitors.html.haml
#	modified:   app/views/layouts/admin.html.haml
#	modified:   app/views/layouts/app.html.haml
#	new file:   app/views/pages/activate.html.haml
#	modified:   app/views/pages/referrals.html.haml
#	modified:   app/views/subscriptions/_edit.html.haml
#	modified:   app/views/users/new.html.haml
#	new file:   config/environments/development.rb.example
#	modified:   config/settings.yml.example
#	modified:   db/fixtures/promotions.yml
#	deleted:    db/migrate/20090625000358_add_controls_to_company.rb
#	deleted:    db/migrate/20090625233314_add_roles_to_order.rb
#	new file:   db/migrate/20090626181531_add_text_logo_to_promotion.rb
#	modified:   public/stylesheets/sass/sessions.sass
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	unmerged:   app/controllers/asks_controller.rb
#	unmerged:   app/controllers/bids_controller.rb
#	unmerged:   app/models/ask.rb
#	unmerged:   app/models/bid.rb
#	unmerged:   app/models/company.rb
#	unmerged:   app/models/order.rb
#	unmerged:   app/views/asks/new.html.haml
#	unmerged:   app/views/bids/new.html.haml
#	unmerged:   config/locales/en.yml
#