Mobile Merge Conflict

gistfile1.txt

Merging remote branch 'rc-7903-the-mob-standard-mobile' from 'mpanic/breport'.

Removing public/responsive_layout_test/js/modernizr-2.0.6.js
CONFLICT (rename/delete): public/pkg/stylesheets/bccee9bf_redesign_tablet_article.css deleted in HEAD and renamed in mpanic/rc-7903-the-mob-standard-mobile. Version mpanic/rc-7903-the-mob-standard-mobile of public/pkg/stylesheets/bccee9bf_redesign_tablet_article.css left in tree.
CONFLICT (rename/delete): public/pkg/stylesheets/ace45007_redesign_articles.css deleted in HEAD and renamed in mpanic/rc-7903-the-mob-standard-mobile. Version mpanic/rc-7903-the-mob-standard-mobile of public/pkg/stylesheets/ace45007_redesign_articles.css left in tree.
CONFLICT (rename/delete): public/pkg/stylesheets/9ef25c13_redesign_mobile_liveblog.css deleted in HEAD and renamed in mpanic/rc-7903-the-mob-standard-mobile. Version mpanic/rc-7903-the-mob-standard-mobile of public/pkg/stylesheets/9ef25c13_redesign_mobile_liveblog.css left in tree.
CONFLICT (rename/rename): Rename "public/pkg/stylesheets/5a5761a6_redesign_tablet_retina.css"->"public/pkg/stylesheets/94994b4a_redesign_tablet_retina.css" in branch "HEAD" rename "public/pkg/stylesheets/5a5761a6_redesign_tablet_retina.css"->"public/pkg/stylesheets/a0c46131_redesign_tablet_retina.css" in "mpanic/rc-7903-the-mob-standard-mobile"
CONFLICT (rename/rename): Rename "public/pkg/stylesheets/54ae0c44_redesign_tablet_standard.css"->"public/pkg/stylesheets/89825a6d_redesign_tablet_standard.css" in branch "HEAD" rename "public/pkg/stylesheets/54ae0c44_redesign_tablet_standard.css"->"public/pkg/stylesheets/e006719f_redesign_tablet_standard.css" in "mpanic/rc-7903-the-mob-standard-mobile"
CONFLICT (rename/delete): public/pkg/stylesheets/617c6068_redesign_mobile_slideshow.css deleted in HEAD and renamed in mpanic/rc-7903-the-mob-standard-mobile. Version mpanic/rc-7903-the-mob-standard-mobile of public/pkg/stylesheets/617c6068_redesign_mobile_slideshow.css left in tree.
CONFLICT (rename/delete): public/pkg/stylesheets/53ada6bc_redesign_mobile_article.css deleted in HEAD and renamed in mpanic/rc-7903-the-mob-standard-mobile. Version mpanic/rc-7903-the-mob-standard-mobile of public/pkg/stylesheets/53ada6bc_redesign_mobile_article.css left in tree.
CONFLICT (rename/delete): public/pkg/stylesheets/43f0449d_redesign_mobile_debate.css deleted in HEAD and renamed in mpanic/rc-7903-the-mob-standard-mobile. Version mpanic/rc-7903-the-mob-standard-mobile of public/pkg/stylesheets/43f0449d_redesign_mobile_debate.css left in tree.
CONFLICT (rename/rename): Rename "public/pkg/javascripts/8d659d11_redesign_tablet_common.js"->"public/pkg/javascripts/ff30b3e7_redesign_tablet_common.js" in branch "HEAD" rename "public/pkg/javascripts/8d659d11_redesign_tablet_common.js"->"public/pkg/javascripts/8a42f08d_redesign_tablet_common.js" in "mpanic/rc-7903-the-mob-standard-mobile"
Auto-merging public/pkg/javascripts/dc0073b0_redesign_slideshow_preview.js
Auto-merging public/pkg/javascripts/dc0073b0_redesign_mobile_debate.js
Removing public/pkg/javascripts/c8c253be_redesign_mobile_top.js
CONFLICT (rename/rename): Rename "public/pkg/javascripts/34f890ce_redesign_newsletter_static.js"->"public/pkg/javascripts/b6f0d819_redesign_newsletter_static.js" in branch "HEAD" rename "public/pkg/javascripts/34f890ce_redesign_newsletter_static.js"->"public/pkg/javascripts/c0f9ae46_redesign_newsletter_static.js" in "mpanic/rc-7903-the-mob-standard-mobile"
CONFLICT (rename/rename): Rename "public/pkg/javascripts/1ddaeea5_responsive_module_liveblog.js"->"public/pkg/javascripts/a043cfe9_responsive_module_liveblog.js" in branch "HEAD" rename "public/pkg/javascripts/1ddaeea5_responsive_module_liveblog.js"->"public/pkg/javascripts/03878562_responsive_module_liveblog.js" in "mpanic/rc-7903-the-mob-standard-mobile"
CONFLICT (rename/rename): Rename "public/pkg/javascripts/d270d384_redesign_common.js"->"public/pkg/javascripts/8cf8eacf_redesign_common.js" in branch "HEAD" rename "public/pkg/javascripts/d270d384_redesign_common.js"->"public/pkg/javascripts/a525caf2_redesign_common.js" in "mpanic/rc-7903-the-mob-standard-mobile"
CONFLICT (rename/delete): public/pkg/javascripts/6c9d2f5c_redesign_mobile.js deleted in mpanic/rc-7903-the-mob-standard-mobile and renamed in HEAD. Version HEAD of public/pkg/javascripts/6c9d2f5c_redesign_mobile.js left in tree.
Auto-merging public/pkg/javascripts/676efdd9_redesign_mobile_slideshow.js
Auto-merging public/pkg/javascripts/5953d036_redesign_mobile_entry.js
CONFLICT (rename/rename): Rename "public/pkg/javascripts/cbeb9a0c_redesign_mobile_liveblog.js"->"public/pkg/javascripts/493c03d7_redesign_mobile_liveblog.js" in branch "HEAD" rename "public/pkg/javascripts/cbeb9a0c_redesign_mobile_liveblog.js"->"public/pkg/javascripts/098af355_redesign_mobile_liveblog.js" in "mpanic/rc-7903-the-mob-standard-mobile"
CONFLICT (rename/rename): Rename "public/pkg/javascripts/0ea6a47d_redesign_article.js"->"public/pkg/javascripts/23ba61ca_redesign_article.js" in branch "HEAD" rename "public/pkg/javascripts/0ea6a47d_redesign_article.js"->"public/pkg/javascripts/d84594b2_redesign_article.js" in "mpanic/rc-7903-the-mob-standard-mobile"
Auto-merging public/pkg/javascripts/1f80a3f5_redesign_mobile_article.js
CONFLICT (rename/rename): Rename "public/pkg/javascripts/72d6d38e_redesign_tablet_article.js"->"public/pkg/javascripts/17e51633_redesign_tablet_article.js" in branch "HEAD" rename "public/pkg/javascripts/72d6d38e_redesign_tablet_article.js"->"public/pkg/javascripts/6d76374d_redesign_tablet_article.js" in "mpanic/rc-7903-the-mob-standard-mobile"
Auto-merging config/routes.rb
Auto-merging config/assets.yml
Auto-merging app/views/layouts/default.html.erb
Auto-merging app/views/layouts/bleacherreport/content/_page_content_mobile.html.erb
Auto-merging app/controllers/article_controller.rb
CONFLICT (content): Merge conflict in app/controllers/article_controller.rb
Automatic merge failed; fix conflicts and then commit the result.


Gitcycle encountered an error when running the last command:
  git merge mpanic/rc-7903-the-mob-standard-mobile
Please copy this session's output and send it to [email protected].

dan@Dan-Pateys-MacBook-Pro:breport (qa_rc_DanPatey|MERGING) $