Code review comment for lp://staging/~cjohnston/qa-dashboard/xorg-plumbing-charts

Attempt to merge into lp:qa-dashboard failed due to conflicts:

path conflict in <deleted>
path conflict in NOTES
text conflict in bootspeed/models.py
text conflict in bootspeed/templates/bootspeed/arch_overview.html
text conflict in bootspeed/templates/bootspeed/image_chart.html
text conflict in bootspeed/templates/bootspeed/machine_data.html
text conflict in bootspeed/templates/bootspeed/machine_raw_data.html
text conflict in common/management/commands/clear_items.py
duplicate in common/migrations.moved
text conflict in common/models.py
text conflict in common/static/css/style.css
text conflict in common/templates/404.html
text conflict in common/templates/500.html
text conflict in common/templates/api_help.html
text conflict in common/templates/layout.html
text conflict in common/views.py
deleting parent in dashboard
unversioned parent in dashboard
deleting parent in dashboard/migrations
unversioned parent in dashboard/migrations
contents conflict in dashboard/migrations/0001_initial.py
contents conflict in dashboard/migrations/0002_auto__add_field_run_internal__add_field_bug_internal__add_field_build_.py
contents conflict in dashboard/migrations/0003_auto__add_field_run_publish__add_field_bug_publish__add_field_build_pu.py
contents conflict in dashboard/migrations/0004_auto__add_kernel__add_sruresult__add_sruresultlog.py
contents conflict in dashboard/migrations/0005_auto__add_field_kernel_job_type.py
contents conflict in dashboard/migrations/0006_auto__add_field_sruresult_kernel_version.py
contents conflict in dashboard/migrations/0007_auto__add_field_kernel_version__del_field_sruresult_kernel_version.py
contents conflict in dashboard/migrations/0008_auto__add_imageresult__add_machine__add_image.py
contents conflict in dashboard/migrations/0009_auto__add_unique_machine_name__add_unique_image_release_arch_variant_b.py
contents conflict in dashboard/migrations/0010_auto__add_unique_image_md5.py
contents conflict in dashboard/migrations/0011_removing_bootspeed.py
contents conflict in dashboard/migrations/__init__.py
text conflict in qa_dashboard/settings.py
text conflict in qa_dashboard/urls.py
duplicate in smoke.moved
path conflict in smoke.moved/__init__.py
path conflict in smoke.moved/api.py
path conflict in smoke.moved/forms.py
path conflict in smoke.moved/management
path conflict in smoke.moved/models.py
path conflict in smoke.moved/templates
path conflict in smoke.moved/tests.py
path conflict in smoke.moved/utah_parser.py
path conflict in smoke.moved/utah_utils.py
path conflict in smoke.moved/views.py
text conflict in smoke/api.py
text conflict in smoke/management/commands/jenkins_pull.py
text conflict in smoke/models.py
text conflict in smoke/templates/smoke/result_logs.html
duplicate in sru.moved
path conflict in sru.moved/management/commands/jenkins_pull_sru.py
path conflict in sru.moved/templates/sru
path conflict in sru.moved/views.py
text conflict in sru/management/commands/jenkins_pull_sru.py