search

pantheon-systems / terminus

The Pantheon CLI — a standalone utility for performing operations on the Pantheon Platform
https://pantheon.io
Other
318 stars 196 forks source link

PHP fatal errors when merging master into a multi-dev and there are merge conflicts #1804

Closed dalin- closed 5 years ago

dalin- commented 6 years ago

Steps to reproduce

terminus multidev:merge-from-dev site.multidev

Expected behavior

Merge fails and conflicts are reported.

Actual behavior

PHP Warning: strtr() expects parameter 1 to be string, array given in /Users/dave/.composer/global/pantheon-systems/terminus/vendor/pantheon-systems/terminus/src/Exceptions/TerminusException.php on line 72

Warning: strtr() expects parameter 1 to be string, array given in /Users/dave/.composer/global/pantheon-systems/terminus/vendor/pantheon-systems/terminus/src/Exceptions/TerminusException.php on line 72 [error]

If run with -vvv:

 [debug] Plugin Autoload: %dir is a Terminus source file.
 [debug] #### REQUEST ####
Headers: {"Content-type":"application\/json","User-Agent":"Terminus\/1.6.1 (php_version=7.0.20&script=bin\/terminus)","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/site-names/stanford-hs
Method: GET
Body: null
 [debug] #### RESPONSE ####
Headers: {"Server":["nginx"],"Date":["Fri, 08 Dec 2017 21:32:06 GMT"],"Content-Type":["application\/json; charset=utf-8"],"Transfer-Encoding":["chunked"],"Connection":["keep-alive"],"X-Pantheon-Trace-Id":["3ce2f480-dc5f-11e7-bb35-95ec2b7454d0"],"X-Frame-Options":["deny"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["Origin, Content-Type, Accept"],"Cache-Control":["private, max-age=0, no-cache, no-store"],"Pragma":["no-cache"],"Vary":["Accept-Encoding"],"Strict-Transport-Security":["max-age=31536000"]}
Data: {"id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","name":"stanford-hs"}
Status Code: 200
 [debug] #### REQUEST ####
Headers: {"Content-type":"application\/json","User-Agent":"Terminus\/1.6.1 (php_version=7.0.20&script=bin\/terminus)","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/f8959ca9-1f8f-46bc-8539-8ffcf95e273f?site_state=true
Method: GET
Body: null
 [debug] #### RESPONSE ####
Headers: {"Server":["nginx"],"Date":["Fri, 08 Dec 2017 21:32:07 GMT"],"Content-Type":["application\/json"],"Content-Length":["3786"],"Connection":["keep-alive"],"X-Pantheon-Trace-Id":["3dbfbff0-dc5f-11e7-bb35-95ec2b7454d0"],"X-Frame-Options":["deny"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["Origin, Content-Type, Accept"],"Cache-Control":["private, max-age=0, no-cache, no-store"],"Pragma":["no-cache"],"Vary":["Accept-Encoding"],"Strict-Transport-Security":["max-age=31536000"]}
Data: {"allow_cacheserver":true,"allow_indexserver":true,"cost":100,"created":1500334922,"created_by_user_id":"b820eef3-7f0e-4c33-9c77-f563783def9d","current_num_domains":3,"drush_version":8,"framework":"drupal8","holder_id":"5e4c2207-a2b5-4e86-961d-d35522641447","holder_type":"user","instrument":"855aa779-e04d-ece5-7895-207b9f6c6ad6","last_code_push":{"timestamp":"2017-12-08T19:41:42","user_uuid":"47c12405-c7cf-4d69-951d-9381cc5eb545"},"name":"stanford-hs","organization":"2d9c0d71-3bc6-4f3a-8517-d4de231ed69a","owner":"5e4c2207-a2b5-4e86-961d-d35522641447","php_version":"55","preferred_zone":"us-central1","purchased_at":1508018796,"service_level":"pro","service_level_updated_at":1508018796,"upstream":{"repository_branch":"master","machine_name":"advostarter-d8","product_id":"cbdeadf3-669f-4848-94f5-c2354f256de8","url":"https:\/\/github.com\/Advomatic\/advostarter-d8.git","label":"Advostarter D8","organization_id":"2d9c0d71-3bc6-4f3a-8517-d4de231ed69a","framework":"drupal8","branch":"master","repository_url":"https:\/\/github.com\/Advomatic\/advostarter-d8.git","type":"custom","id":"cbdeadf3-669f-4848-94f5-c2354f256de8"},"label":"Stanford H&S","id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","holder":{"profile":{"utm_content":"","experiments":{"activation_walkme":"original","welcome_video":"shown"},"full_name":"Dustin Liang","initial_identity_strategy":null,"utm_campaign":"","tracking_first_site_create":1454711717,"verify":"5d0cd81c8dd917659a9bb0b9d33d256f","utm_device":"","registration_context":null,"utm_medium":"","job_function":"owner","tracking_first_workflow_in_live":1454712193,"google_adwords_account_registered_do_send":null,"firstname":"Dustin","utm_term":"","lastname":"Liang","pda_campaign":"","utm_source":"","google_adwords_account_registered_sent":1454698750,"web_services_business":null,"initial_identity_name":null,"guilty_of_abuse":null,"modified":1454698742,"maxdevsites":2,"lead_type":"","organization":"Stanford University"},"id":"5e4c2207-a2b5-4e86-961d-d35522641447","email":"dhliang@stanford.edu"},"settings":{"allow_domains":true,"max_num_cdes":10,"stunnel":false,"replica_verification_strategy":"pt-heartbeat","cost":100,"owner":"5e4c2207-a2b5-4e86-961d-d35522641447","secure_runtime_access":false,"current_num_domains":3,"guilty_of_abuse":null,"created_by_user_id":"b820eef3-7f0e-4c33-9c77-f563783def9d","failover_appserver":0,"pingdom":0,"cacheserver":1,"support_plan":"regular_support","appserver":1,"on_server_development":false,"drush_version":8,"label":"Stanford H&S","instrument":"855aa779-e04d-ece5-7895-207b9f6c6ad6","allow_read_slaves":false,"indexserver":1,"php_version":"55","php_channel":"stable","allow_cacheserver":true,"ssl_enabled":null,"service_level":"pro","dedicated_ip":null,"dbserver":1,"purchased_at":1508018796,"framework":"drupal8","max_total_domains":25,"upstream":{"url":"https:\/\/github.com\/Advomatic\/advostarter-d8.git","product_id":"cbdeadf3-669f-4848-94f5-c2354f256de8","branch":"master"},"allow_indexserver":true,"preferred_zone":"us-central1","pingdom_chance":0,"holder_id":"5e4c2207-a2b5-4e86-961d-d35522641447","name":"stanford-hs","created":1500334922,"max_backups":7,"last_code_push":{"timestamp":"2017-12-08T19:41:42","user_uuid":"47c12405-c7cf-4d69-951d-9381cc5eb545"},"holder_type":"user","min_backups":0,"organization":"2d9c0d71-3bc6-4f3a-8517-d4de231ed69a","pingdom_manually_enabled":false,"service_level_updated_at":1508018796},"base_domain":null,"attributes":{"hostname_limit":true,"label":"Stanford H&S","m3_ui":true},"add_ons":[{"id":"NewRelic","label":"New Relic"}]}
Status Code: 200
 [debug] #### REQUEST ####
Headers: {"Content-type":"application\/json","User-Agent":"Terminus\/1.6.1 (php_version=7.0.20&script=bin\/terminus)","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/f8959ca9-1f8f-46bc-8539-8ffcf95e273f/environments
Method: GET
Body: null
 [debug] #### RESPONSE ####
Headers: {"Server":["nginx"],"Date":["Fri, 08 Dec 2017 21:32:08 GMT"],"Content-Type":["application\/json; charset=utf-8"],"Transfer-Encoding":["chunked"],"Connection":["keep-alive"],"X-Pantheon-Trace-Id":["3e724710-dc5f-11e7-8d3c-db9e08076cd7"],"X-Frame-Options":["deny"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["Origin, Content-Type, Accept"],"Cache-Control":["private, max-age=0, no-cache, no-store"],"Pragma":["no-cache"],"Vary":["Accept-Encoding"],"Strict-Transport-Security":["max-age=31536000"]}
Data: {"live":{"is_initialized":true,"styx_clusters_for_cache_clear":["styx-03.pantheon.io","styx-1-gcp-fastly-stub.pantheon.io","edge.live.getpantheon.com","styx-fe1.pantheon.io","styx-02.pantheon.io","styx-fe2.pantheon.io","styx-yolo.pantheon.io","styx-fe4.pantheon.io","styx-fe3.pantheon.io","styx-01.pantheon.io"],"environment_created":1500334932,"dns_zone":"pantheonsite.io","randseed":"HOMP3DSYOQ2AB80AUM2ZQ3T6STLK8GN9","target_commit":"2c9f241e8bafdb4402bced854b8d9fceb34de310","target_ref":"refs\/tags\/pantheon_live_11","php_version":"70","lock":{"username":null,"password":null,"locked":false},"environment_variables":{"DOCROOT":"web","php_version":7},"styx_cluster":"styx-fe4.pantheon.io"},"dev":{"quicksilver_configuration":{},"styx_clusters_for_cache_clear":["styx-03.pantheon.io","styx-1-gcp-fastly-stub.pantheon.io","edge.live.getpantheon.com","styx-fe1.pantheon.io","styx-02.pantheon.io","styx-fe2.pantheon.io","styx-yolo.pantheon.io","styx-fe4.pantheon.io","styx-fe3.pantheon.io","styx-01.pantheon.io"],"is_initialized":true,"diffstat":{},"on_server_development":false,"environment_created":1500334922,"dns_zone":"pantheonsite.io","randseed":"RZ0ZOKYJGY39CIWBOAUZOJO50Z54TIFJ","target_commit":"70d64c9fa674539658d96f3eb9913f942bfd8d2c","target_ref":"refs\/heads\/master","php_version":"70","lock":{"username":"no content here","password":"stanford","locked":true},"environment_variables":{"DOCROOT":"web","php_version":7},"styx_cluster":"styx-fe4.pantheon.io"},"test":{"is_initialized":true,"styx_clusters_for_cache_clear":["styx-03.pantheon.io","styx-1-gcp-fastly-stub.pantheon.io","edge.live.getpantheon.com","styx-fe1.pantheon.io","styx-02.pantheon.io","styx-fe2.pantheon.io","styx-yolo.pantheon.io","styx-fe4.pantheon.io","styx-fe3.pantheon.io","styx-01.pantheon.io"],"environment_created":1500334928,"dns_zone":"pantheonsite.io","randseed":"Y5VWMIIUCYZQ1AIGIB679KVQ1NLTKVQ3","target_commit":"2c9f241e8bafdb4402bced854b8d9fceb34de310","target_ref":"refs\/tags\/pantheon_test_16","php_version":"70","lock":{"username":null,"password":null,"locked":false},"environment_variables":{"DOCROOT":"web","php_version":7},"styx_cluster":"styx-fe4.pantheon.io"},"iteration10":{"is_initialized":true,"styx_clusters_for_cache_clear":["styx-03.pantheon.io","styx-1-gcp-fastly-stub.pantheon.io","edge.live.getpantheon.com","styx-fe1.pantheon.io","styx-02.pantheon.io","styx-fe2.pantheon.io","styx-yolo.pantheon.io","styx-fe4.pantheon.io","styx-fe3.pantheon.io","styx-01.pantheon.io"],"environment_created":1511376029,"dns_zone":"pantheonsite.io","randseed":"OWT1H4UX27J48PWD2NO919VCNKKKBANN","target_commit":"9e0f5a7ba83c772c603a94de5b45569d553165f1","target_ref":"refs\/heads\/iteration10","php_version":"70","lock":{"username":null,"password":null,"locked":false},"environment_variables":{"DOCROOT":"web","php_version":7},"styx_cluster":"styx-fe4.pantheon.io"},"sec-2017-11":{"quicksilver_configuration":{},"is_initialized":true,"styx_clusters_for_cache_clear":["styx-03.pantheon.io","styx-1-gcp-fastly-stub.pantheon.io","edge.live.getpantheon.com","styx-fe1.pantheon.io","styx-02.pantheon.io","styx-fe2.pantheon.io","styx-yolo.pantheon.io","styx-fe4.pantheon.io","styx-fe3.pantheon.io","styx-01.pantheon.io"],"environment_created":1512582217,"dns_zone":"pantheonsite.io","randseed":"3K5DMLI2ID0VG0GFJQVYYKGF69O1XWF0","target_commit":"0332ca31b7e3929f47176d599fb55d84e63cf33d","target_ref":"refs\/heads\/sec-2017-11","php_version":"70","lock":{"username":null,"password":null,"locked":false},"environment_variables":{"DOCROOT":"web","php_version":7},"styx_cluster":"styx-fe4.pantheon.io"}}
Status Code: 200
 [debug] #### REQUEST ####
Headers: {"Content-type":"application\/json","User-Agent":"Terminus\/1.6.1 (php_version=7.0.20&script=bin\/terminus)","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/f8959ca9-1f8f-46bc-8539-8ffcf95e273f/environments/iteration10/workflows
Method: POST
Body: {"type":"merge_dev_into_cloud_development_environment","params":{"updatedb":false}}
 [debug] #### RESPONSE ####
Headers: {"Server":["nginx"],"Date":["Fri, 08 Dec 2017 21:32:09 GMT"],"Content-Type":["application\/json; charset=utf-8"],"Transfer-Encoding":["chunked"],"Connection":["keep-alive"],"X-Pantheon-Trace-Id":["3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00"],"X-Frame-Options":["deny"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["Origin, Content-Type, Accept"],"Cache-Control":["private, max-age=0, no-cache, no-store"],"Pragma":["no-cache"],"Vary":["Accept-Encoding"]}
Data: {"environment_id":"iteration10","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","params":{"updatedb":false},"task_ids":["3ec3b1f4-dc5f-11e7-9f25-42010a800153","3ec4cce2-dc5f-11e7-9f25-42010a800153","3ed3148c-dc5f-11e7-9f25-42010a800153"],"role":"owner","type":"merge_dev_into_cloud_development_environment","id":"3ebefe98-dc5f-11e7-9f25-42010a800153","key":"1512766800","waiting_for_task_id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","keep_forever":false,"phase":"created","queued_time":null,"run_time":null,"created_at":1512768729.0798,"reason":"","environment":"iteration10","final_task_id":null,"result":null,"total_time":null,"active_description":"Merge code from master into \"iteration10\"","description":"Merge code from master into \"iteration10\"","step":1,"has_operation_log_output":false,"number_of_tasks":3,"trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.079772Z%27,mode:quick,to:%27now%27))","user":{"user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","created_at":1387315904,"destination_organization_id":"2d9c0d71-3bc6-4f3a-8517-d4de231ed69a","is_registered":true,"created_organization_id":null,"password":"SCRUBBED","email":"dave@advomatic.com"},"user_email":"dave@advomatic.com","waiting_for_task":{"environment":"iteration10","fn_name":"trigger_task","initialized_at":1512768729.24,"params":{"environment":"iteration10","attempt_ff":true,"task_type":"merge_code_from_environment","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","from_environment":"dev"},"site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","workflow_id":"3ebefe98-dc5f-11e7-9f25-42010a800153","id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","key":"1512766800","responses":[],"queued_time":null,"host":null,"result":null,"phase":"initialized","created_at":1512768729.1106,"allow_concurrent":false,"run_time":null,"total_time":null,"reason":"","error_details":"","internal_reason":"","trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.110578Z%27,mode:quick,to:%27now%27))","type":"merge_code_from_environment","build_url":null,"messages":{}}}
Status Code: 202
 [debug] #### REQUEST ####
Headers: {"Content-type":"application\/json","User-Agent":"Terminus\/1.6.1 (php_version=7.0.20&script=bin\/terminus)","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/f8959ca9-1f8f-46bc-8539-8ffcf95e273f/workflows/3ebefe98-dc5f-11e7-9f25-42010a800153
Method: GET
Body: null
 [debug] #### RESPONSE ####
Headers: {"Server":["nginx"],"Date":["Fri, 08 Dec 2017 21:32:09 GMT"],"Content-Type":["application\/json; charset=utf-8"],"Transfer-Encoding":["chunked"],"Connection":["keep-alive"],"X-Pantheon-Trace-Id":["3f201340-dc5f-11e7-b3f6-3d284eb9a723"],"X-Frame-Options":["deny"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["Origin, Content-Type, Accept"],"Cache-Control":["private, max-age=0, no-cache, no-store"],"Pragma":["no-cache"],"Vary":["Accept-Encoding"],"Strict-Transport-Security":["max-age=31536000"]}
Data: {"environment_id":"iteration10","params":{"updatedb":false},"role":"owner","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","task_ids":["3ec3b1f4-dc5f-11e7-9f25-42010a800153","3ec4cce2-dc5f-11e7-9f25-42010a800153","3ed3148c-dc5f-11e7-9f25-42010a800153"],"trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","type":"merge_dev_into_cloud_development_environment","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","id":"3ebefe98-dc5f-11e7-9f25-42010a800153","key":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","waiting_for_task_id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","keep_forever":false,"phase":"created","queued_time":null,"run_time":null,"created_at":1512768729.0798,"reason":"","environment":"iteration10","final_task_id":null,"result":null,"total_time":null,"active_description":"Merge code from master into \"iteration10\"","description":"Merge code from master into \"iteration10\"","step":1,"has_operation_log_output":false,"number_of_tasks":3,"trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.079772Z%27,mode:quick,to:%27now%27))","user":{"user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","created_at":1387315904,"destination_organization_id":"2d9c0d71-3bc6-4f3a-8517-d4de231ed69a","is_registered":true,"created_organization_id":null,"password":"SCRUBBED","email":"dave@advomatic.com"},"user_email":"dave@advomatic.com","waiting_for_task":{"environment":"iteration10","fn_name":"trigger_task","initialized_at":1512768729.24,"params":{"environment":"iteration10","attempt_ff":true,"task_type":"merge_code_from_environment","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","from_environment":"dev"},"site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","workflow_id":"3ebefe98-dc5f-11e7-9f25-42010a800153","id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","key":"1512766800","responses":[],"queued_time":null,"host":null,"result":null,"phase":"initialized","created_at":1512768729.1106,"allow_concurrent":false,"run_time":null,"total_time":null,"reason":"","error_details":"","internal_reason":"","trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.110578Z%27,mode:quick,to:%27now%27))","type":"merge_code_from_environment","build_url":null,"messages":{}}}
Status Code: 200
 [debug] #### REQUEST ####
Headers: {"Content-type":"application\/json","User-Agent":"Terminus\/1.6.1 (php_version=7.0.20&script=bin\/terminus)","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/f8959ca9-1f8f-46bc-8539-8ffcf95e273f/workflows/3ebefe98-dc5f-11e7-9f25-42010a800153
Method: GET
Body: null
 [debug] #### RESPONSE ####
Headers: {"Server":["nginx"],"Date":["Fri, 08 Dec 2017 21:32:10 GMT"],"Content-Type":["application\/json; charset=utf-8"],"Transfer-Encoding":["chunked"],"Connection":["keep-alive"],"X-Pantheon-Trace-Id":["3f6a1491-dc5f-11e7-8d3c-db9e08076cd7"],"X-Frame-Options":["deny"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["Origin, Content-Type, Accept"],"Cache-Control":["private, max-age=0, no-cache, no-store"],"Pragma":["no-cache"],"Vary":["Accept-Encoding"],"Strict-Transport-Security":["max-age=31536000"]}
Data: {"environment_id":"iteration10","params":{"updatedb":false},"role":"owner","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","task_ids":["3ec3b1f4-dc5f-11e7-9f25-42010a800153","3ec4cce2-dc5f-11e7-9f25-42010a800153","3ed3148c-dc5f-11e7-9f25-42010a800153"],"trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","type":"merge_dev_into_cloud_development_environment","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","id":"3ebefe98-dc5f-11e7-9f25-42010a800153","key":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","waiting_for_task_id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","keep_forever":false,"phase":"created","queued_time":null,"run_time":null,"created_at":1512768729.0798,"reason":"","environment":"iteration10","final_task_id":null,"result":null,"total_time":null,"active_description":"Merge code from master into \"iteration10\"","description":"Merge code from master into \"iteration10\"","step":1,"has_operation_log_output":false,"number_of_tasks":3,"trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.079772Z%27,mode:quick,to:%27now%27))","user":{"user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","created_at":1387315904,"destination_organization_id":"2d9c0d71-3bc6-4f3a-8517-d4de231ed69a","is_registered":true,"created_organization_id":null,"password":"SCRUBBED","email":"dave@advomatic.com"},"user_email":"dave@advomatic.com","waiting_for_task":{"environment":"iteration10","fn_name":"trigger_task","initialized_at":1512768729.24,"params":{"environment":"iteration10","attempt_ff":true,"task_type":"merge_code_from_environment","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","from_environment":"dev"},"site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","workflow_id":"3ebefe98-dc5f-11e7-9f25-42010a800153","id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","key":"1512766800","responses":[],"queued_time":null,"host":null,"result":null,"phase":"initialized","created_at":1512768729.1106,"allow_concurrent":false,"run_time":null,"total_time":null,"reason":"","error_details":"","internal_reason":"","trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.110578Z%27,mode:quick,to:%27now%27))","type":"merge_code_from_environment","build_url":null,"messages":{}}}
Status Code: 200
 [debug] #### REQUEST ####
Headers: {"Content-type":"application\/json","User-Agent":"Terminus\/1.6.1 (php_version=7.0.20&script=bin\/terminus)","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/f8959ca9-1f8f-46bc-8539-8ffcf95e273f/workflows/3ebefe98-dc5f-11e7-9f25-42010a800153
Method: GET
Body: null
 [debug] #### RESPONSE ####
Headers: {"Server":["nginx"],"Date":["Fri, 08 Dec 2017 21:32:11 GMT"],"Content-Type":["application\/json; charset=utf-8"],"Transfer-Encoding":["chunked"],"Connection":["keep-alive"],"X-Pantheon-Trace-Id":["402af390-dc5f-11e7-92d2-c1328ba8eb00"],"X-Frame-Options":["deny"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["Origin, Content-Type, Accept"],"Cache-Control":["private, max-age=0, no-cache, no-store"],"Pragma":["no-cache"],"Vary":["Accept-Encoding"],"Strict-Transport-Security":["max-age=31536000"]}
Data: {"environment_id":"iteration10","params":{"updatedb":false},"role":"owner","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","task_ids":["3ec3b1f4-dc5f-11e7-9f25-42010a800153","3ec4cce2-dc5f-11e7-9f25-42010a800153","3ed3148c-dc5f-11e7-9f25-42010a800153"],"trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","type":"merge_dev_into_cloud_development_environment","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","id":"3ebefe98-dc5f-11e7-9f25-42010a800153","key":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","waiting_for_task_id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","keep_forever":false,"phase":"created","queued_time":null,"run_time":null,"created_at":1512768729.0798,"reason":"","environment":"iteration10","final_task_id":null,"result":null,"total_time":null,"active_description":"Merge code from master into \"iteration10\"","description":"Merge code from master into \"iteration10\"","step":1,"has_operation_log_output":false,"number_of_tasks":3,"trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.079772Z%27,mode:quick,to:%27now%27))","user":{"user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","created_at":1387315904,"destination_organization_id":"2d9c0d71-3bc6-4f3a-8517-d4de231ed69a","is_registered":true,"created_organization_id":null,"password":"SCRUBBED","email":"dave@advomatic.com"},"user_email":"dave@advomatic.com","waiting_for_task":{"environment":"iteration10","fn_name":"trigger_task","initialized_at":1512768729.24,"params":{"environment":"iteration10","attempt_ff":true,"task_type":"merge_code_from_environment","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","from_environment":"dev"},"site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","workflow_id":"3ebefe98-dc5f-11e7-9f25-42010a800153","id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","key":"1512766800","responses":[],"queued_time":null,"host":null,"result":null,"phase":"initialized","created_at":1512768729.1106,"allow_concurrent":false,"run_time":null,"total_time":null,"reason":"","error_details":"","internal_reason":"","trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.110578Z%27,mode:quick,to:%27now%27))","type":"merge_code_from_environment","build_url":null,"messages":{}}}
Status Code: 200
 [debug] #### REQUEST ####
Headers: {"Content-type":"application\/json","User-Agent":"Terminus\/1.6.1 (php_version=7.0.20&script=bin\/terminus)","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/f8959ca9-1f8f-46bc-8539-8ffcf95e273f/workflows/3ebefe98-dc5f-11e7-9f25-42010a800153
Method: GET
Body: null
 [debug] #### RESPONSE ####
Headers: {"Server":["nginx"],"Date":["Fri, 08 Dec 2017 21:32:12 GMT"],"Content-Type":["application\/json; charset=utf-8"],"Transfer-Encoding":["chunked"],"Connection":["keep-alive"],"X-Pantheon-Trace-Id":["40b50b20-dc5f-11e7-bfbb-0b1322d259ff"],"X-Frame-Options":["deny"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["Origin, Content-Type, Accept"],"Cache-Control":["private, max-age=0, no-cache, no-store"],"Pragma":["no-cache"],"Vary":["Accept-Encoding"],"Strict-Transport-Security":["max-age=31536000"]}
Data: {"environment_id":"iteration10","params":{"updatedb":false},"role":"owner","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","task_ids":["3ec3b1f4-dc5f-11e7-9f25-42010a800153","3ec4cce2-dc5f-11e7-9f25-42010a800153","3ed3148c-dc5f-11e7-9f25-42010a800153"],"trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","type":"merge_dev_into_cloud_development_environment","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","id":"3ebefe98-dc5f-11e7-9f25-42010a800153","key":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","waiting_for_task_id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","keep_forever":false,"phase":"created","queued_time":null,"run_time":null,"created_at":1512768729.0798,"reason":"","environment":"iteration10","final_task_id":null,"result":null,"total_time":null,"active_description":"Merge code from master into \"iteration10\"","description":"Merge code from master into \"iteration10\"","step":1,"has_operation_log_output":false,"number_of_tasks":3,"trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.079772Z%27,mode:quick,to:%27now%27))","user":{"user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","created_at":1387315904,"destination_organization_id":"2d9c0d71-3bc6-4f3a-8517-d4de231ed69a","is_registered":true,"created_organization_id":null,"password":"SCRUBBED","email":"dave@advomatic.com"},"user_email":"dave@advomatic.com","waiting_for_task":{"environment":"iteration10","fn_name":"trigger_task","initialized_at":1512768729.24,"params":{"environment":"iteration10","attempt_ff":true,"task_type":"merge_code_from_environment","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","from_environment":"dev"},"site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","workflow_id":"3ebefe98-dc5f-11e7-9f25-42010a800153","id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","key":"1512766800","responses":[],"queued_time":null,"host":null,"result":null,"phase":"initialized","created_at":1512768729.1106,"allow_concurrent":false,"run_time":null,"total_time":null,"reason":"","error_details":"","internal_reason":"","trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.110578Z%27,mode:quick,to:%27now%27))","type":"merge_code_from_environment","build_url":null,"messages":{}}}
Status Code: 200
 [debug] #### REQUEST ####
Headers: {"Content-type":"application\/json","User-Agent":"Terminus\/1.6.1 (php_version=7.0.20&script=bin\/terminus)","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/f8959ca9-1f8f-46bc-8539-8ffcf95e273f/workflows/3ebefe98-dc5f-11e7-9f25-42010a800153
Method: GET
Body: null
 [debug] #### RESPONSE ####
Headers: {"Server":["nginx"],"Date":["Fri, 08 Dec 2017 21:32:12 GMT"],"Content-Type":["application\/json; charset=utf-8"],"Transfer-Encoding":["chunked"],"Connection":["keep-alive"],"X-Pantheon-Trace-Id":["41096cb0-dc5f-11e7-b361-cf0ef2b49116"],"X-Frame-Options":["deny"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["Origin, Content-Type, Accept"],"Cache-Control":["private, max-age=0, no-cache, no-store"],"Pragma":["no-cache"],"Vary":["Accept-Encoding"],"Strict-Transport-Security":["max-age=31536000"]}
Data: {"environment_id":"iteration10","params":{"updatedb":false},"role":"owner","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","task_ids":["3ec3b1f4-dc5f-11e7-9f25-42010a800153","3ec4cce2-dc5f-11e7-9f25-42010a800153","3ed3148c-dc5f-11e7-9f25-42010a800153"],"trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","type":"merge_dev_into_cloud_development_environment","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","id":"3ebefe98-dc5f-11e7-9f25-42010a800153","key":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","waiting_for_task_id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","keep_forever":false,"phase":"created","queued_time":null,"run_time":null,"created_at":1512768729.0798,"reason":"","environment":"iteration10","final_task_id":null,"result":null,"total_time":null,"active_description":"Merge code from master into \"iteration10\"","description":"Merge code from master into \"iteration10\"","step":1,"has_operation_log_output":false,"number_of_tasks":3,"trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.079772Z%27,mode:quick,to:%27now%27))","user":{"user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","created_at":1387315904,"destination_organization_id":"2d9c0d71-3bc6-4f3a-8517-d4de231ed69a","is_registered":true,"created_organization_id":null,"password":"SCRUBBED","email":"dave@advomatic.com"},"user_email":"dave@advomatic.com","waiting_for_task":{"environment":"iteration10","fn_name":"trigger_task","initialized_at":1512768729.24,"params":{"environment":"iteration10","attempt_ff":true,"task_type":"merge_code_from_environment","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","from_environment":"dev"},"site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","workflow_id":"3ebefe98-dc5f-11e7-9f25-42010a800153","id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","key":"1512766800","responses":[],"queued_time":null,"host":null,"result":null,"phase":"initialized","created_at":1512768729.1106,"allow_concurrent":false,"run_time":null,"total_time":null,"reason":"","error_details":"","internal_reason":"","trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.110578Z%27,mode:quick,to:%27now%27))","type":"merge_code_from_environment","build_url":null,"messages":{}}}
Status Code: 200
 [debug] #### REQUEST ####
Headers: {"Content-type":"application\/json","User-Agent":"Terminus\/1.6.1 (php_version=7.0.20&script=bin\/terminus)","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/f8959ca9-1f8f-46bc-8539-8ffcf95e273f/workflows/3ebefe98-dc5f-11e7-9f25-42010a800153
Method: GET
Body: null
 [debug] #### RESPONSE ####
Headers: {"Server":["nginx"],"Date":["Fri, 08 Dec 2017 21:32:14 GMT"],"Content-Type":["application\/json; charset=utf-8"],"Transfer-Encoding":["chunked"],"Connection":["keep-alive"],"X-Pantheon-Trace-Id":["41ff8c80-dc5f-11e7-9cd3-1fddae00024e"],"X-Frame-Options":["deny"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["Origin, Content-Type, Accept"],"Cache-Control":["private, max-age=0, no-cache, no-store"],"Pragma":["no-cache"],"Vary":["Accept-Encoding"],"Strict-Transport-Security":["max-age=31536000"]}
Data: {"environment_id":"iteration10","params":{"updatedb":false},"role":"owner","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","task_ids":["3ec3b1f4-dc5f-11e7-9f25-42010a800153","3ec4cce2-dc5f-11e7-9f25-42010a800153","3ed3148c-dc5f-11e7-9f25-42010a800153"],"trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","type":"merge_dev_into_cloud_development_environment","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","id":"3ebefe98-dc5f-11e7-9f25-42010a800153","key":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","waiting_for_task_id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","keep_forever":false,"phase":"created","queued_time":null,"run_time":null,"created_at":1512768729.0798,"reason":"","environment":"iteration10","final_task_id":null,"result":null,"total_time":null,"active_description":"Merge code from master into \"iteration10\"","description":"Merge code from master into \"iteration10\"","step":1,"has_operation_log_output":false,"number_of_tasks":3,"trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.079772Z%27,mode:quick,to:%27now%27))","user":{"user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","created_at":1387315904,"destination_organization_id":"2d9c0d71-3bc6-4f3a-8517-d4de231ed69a","is_registered":true,"created_organization_id":null,"password":"SCRUBBED","email":"dave@advomatic.com"},"user_email":"dave@advomatic.com","waiting_for_task":{"environment":"iteration10","fn_name":"trigger_task","initialized_at":1512768729.24,"params":{"environment":"iteration10","attempt_ff":true,"task_type":"merge_code_from_environment","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","from_environment":"dev"},"site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","workflow_id":"3ebefe98-dc5f-11e7-9f25-42010a800153","id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","key":"1512766800","responses":[],"queued_time":null,"host":null,"result":null,"phase":"initialized","created_at":1512768729.1106,"allow_concurrent":false,"run_time":null,"total_time":null,"reason":"","error_details":"","internal_reason":"","trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.110578Z%27,mode:quick,to:%27now%27))","type":"merge_code_from_environment","build_url":null,"messages":{}}}
Status Code: 200
 [debug] #### REQUEST ####
Headers: {"Content-type":"application\/json","User-Agent":"Terminus\/1.6.1 (php_version=7.0.20&script=bin\/terminus)","Authorization":"**HIDDEN**"}
URI: https://terminus.pantheon.io:443/api/sites/f8959ca9-1f8f-46bc-8539-8ffcf95e273f/workflows/3ebefe98-dc5f-11e7-9f25-42010a800153
Method: GET
Body: null
 [debug] #### RESPONSE ####
Headers: {"Server":["nginx"],"Date":["Fri, 08 Dec 2017 21:32:17 GMT"],"Content-Type":["application\/json; charset=utf-8"],"Transfer-Encoding":["chunked"],"Connection":["keep-alive"],"X-Pantheon-Trace-Id":["439b8940-dc5f-11e7-bd2d-f543ff4a9caa"],"X-Frame-Options":["deny"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["Origin, Content-Type, Accept"],"Cache-Control":["private, max-age=0, no-cache, no-store"],"Pragma":["no-cache"],"Vary":["Accept-Encoding"],"Strict-Transport-Security":["max-age=31536000"]}
Data: {"environment_id":"iteration10","final_task_id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","finished_at":1512768734.6824,"params":{"updatedb":false},"reason":["CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/html\/styleguide.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/data\/patternlab-data.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-views\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-header-site-header\/03-organisms-site-site-header-site-header.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-footer-site-footer\/03-organisms-site-site-footer-site-footer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-staff-member\/03-organisms-content-types-node-staff-member.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news\/03-organisms-content-types-node-latest-news.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news-featured\/03-organisms-content-types-node-latest-news-featured.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay-video-with-overlay\/02-molecules-video-with-overlay-video-with-overlay.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status-status\/02-molecules-status-status.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-staff\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer-randomizer\/02-molecules-randomizer-randomizer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager-pager\/02-molecules-pager-pager.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature-multimedia-feature\/02-molecules-multimedia-feature-multimedia-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-subnav-subnav\/02-molecules-menus-subnav-subnav.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-main-menu-main-menu\/02-molecules-menus-main-menu-main-menu.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-breadcrumbs-breadcrumbs\/02-molecules-menus-breadcrumbs-breadcrumbs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-latest-news\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title-hero-title\/02-molecules-hero-title-hero-title.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature-full-bleed-feature\/02-molecules-full-bleed-feature-full-bleed-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty-fifty-fifty\/02-molecules-fifty-fifty-fifty-fifty.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote-featured-quote\/02-molecules-featured-quote-featured-quote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats-circle-stats\/02-molecules-circle-stats-circle-stats.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards-cards\/02-molecules-cards-cards.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-_academics-listing-filter\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu-tab-tab\/01-atoms-09-menu-tab-tab.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video\/01-atoms-08-video-video.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video-full\/01-atoms-08-video-video-full.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables-tables\/01-atoms-07-tables-tables.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-04-button-alt-4\/01-atoms-06-buttons-04-button-alt-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-03-button-alt-3\/01-atoms-06-buttons-03-button-alt-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-02-button-alt-2\/01-atoms-06-buttons-02-button-alt-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button\/01-atoms-06-buttons-01-button.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button-alt\/01-atoms-06-buttons-01-button-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-textfields-textfields\/01-atoms-05-forms-textfields-textfields.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-search-search\/01-atoms-05-forms-search-search.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-icons-icons\/01-atoms-04-images-icons-icons.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-favicon\/01-atoms-04-images-favicon.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-01-logo-logo\/01-atoms-04-images-01-logo-logo.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-00-image-image\/01-atoms-04-images-00-image-image.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-02-definition\/01-atoms-03-lists-02-definition.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-01-ordered\/01-atoms-03-lists-01-ordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-00-unordered\/01-atoms-03-lists-00-unordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-06-hr\/01-atoms-02-text-text-06-hr.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-05-preformatted-text\/01-atoms-02-text-text-05-preformatted-text.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-03-inline-elements\/01-atoms-02-text-text-03-inline-elements.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-paragraph\/01-atoms-02-text-text-01-paragraph.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote\/01-atoms-02-text-text-01-blockquote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote-alt\/01-atoms-02-text-text-01-blockquote-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-6-heading-6\/01-atoms-02-text-00-headings-heading-6-heading-6.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-5-heading-5\/01-atoms-02-text-00-headings-heading-5-heading-5.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-4-heading-4\/01-atoms-02-text-00-headings-heading-4-heading-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-3-heading-3\/01-atoms-02-text-00-headings-heading-3-heading-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-2-heading-2\/01-atoms-02-text-00-headings-heading-2-heading-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1\/01-atoms-02-text-00-headings-heading-1-heading-1.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1-linked\/01-atoms-02-text-00-headings-heading-1-heading-1-linked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links-link-link\/01-atoms-01-links-link-link.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-02-animations-animations\/00-base-global-02-animations-animations.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-01-colors-colors\/00-base-global-01-colors-colors.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/latest-change.txt","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css.map","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/scripts-styleguide.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/video-with-overlay.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/_video-with-overlay.scss"],"result":"aborted","role":"owner","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","started_at":1512768729.2397,"task_ids":["3ec3b1f4-dc5f-11e7-9f25-42010a800153","3ec4cce2-dc5f-11e7-9f25-42010a800153","3ed3148c-dc5f-11e7-9f25-42010a800153"],"trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","type":"merge_dev_into_cloud_development_environment","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","waiting_for_task_id":null,"id":"3ebefe98-dc5f-11e7-9f25-42010a800153","key":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","keep_forever":false,"phase":"finished","queued_time":null,"run_time":5.4427001476288,"created_at":1512768729.0798,"environment":"iteration10","total_time":5.6025850772858,"active_description":"Merged code from master into \"iteration10\"","description":"Merge code from master into \"iteration10\"","step":1,"has_operation_log_output":false,"number_of_tasks":3,"trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.079772Z%27,mode:quick,to:%272017-12-08T21:37:14.682357Z%27))","user":{"user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","created_at":1387315904,"destination_organization_id":"2d9c0d71-3bc6-4f3a-8517-d4de231ed69a","is_registered":true,"created_organization_id":null,"password":"SCRUBBED","email":"dave@advomatic.com"},"user_email":"dave@advomatic.com","final_task":{"environment":"iteration10","finished_at":1512768734.6508,"fn_name":"trigger_task","has_error":true,"initialized_at":1512768729.24,"params":{"environment":"iteration10","attempt_ff":true,"task_type":"merge_code_from_environment","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","from_environment":"dev"},"queued_at":1512768729.2461,"responses":[{"code":409,"body":["CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/html\/styleguide.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/data\/patternlab-data.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-views\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-header-site-header\/03-organisms-site-site-header-site-header.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-footer-site-footer\/03-organisms-site-site-footer-site-footer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-staff-member\/03-organisms-content-types-node-staff-member.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news\/03-organisms-content-types-node-latest-news.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news-featured\/03-organisms-content-types-node-latest-news-featured.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay-video-with-overlay\/02-molecules-video-with-overlay-video-with-overlay.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status-status\/02-molecules-status-status.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-staff\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer-randomizer\/02-molecules-randomizer-randomizer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager-pager\/02-molecules-pager-pager.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature-multimedia-feature\/02-molecules-multimedia-feature-multimedia-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-subnav-subnav\/02-molecules-menus-subnav-subnav.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-main-menu-main-menu\/02-molecules-menus-main-menu-main-menu.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-breadcrumbs-breadcrumbs\/02-molecules-menus-breadcrumbs-breadcrumbs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-latest-news\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title-hero-title\/02-molecules-hero-title-hero-title.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature-full-bleed-feature\/02-molecules-full-bleed-feature-full-bleed-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty-fifty-fifty\/02-molecules-fifty-fifty-fifty-fifty.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote-featured-quote\/02-molecules-featured-quote-featured-quote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats-circle-stats\/02-molecules-circle-stats-circle-stats.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards-cards\/02-molecules-cards-cards.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-_academics-listing-filter\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu-tab-tab\/01-atoms-09-menu-tab-tab.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video\/01-atoms-08-video-video.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video-full\/01-atoms-08-video-video-full.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables-tables\/01-atoms-07-tables-tables.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-04-button-alt-4\/01-atoms-06-buttons-04-button-alt-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-03-button-alt-3\/01-atoms-06-buttons-03-button-alt-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-02-button-alt-2\/01-atoms-06-buttons-02-button-alt-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button\/01-atoms-06-buttons-01-button.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button-alt\/01-atoms-06-buttons-01-button-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-textfields-textfields\/01-atoms-05-forms-textfields-textfields.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-search-search\/01-atoms-05-forms-search-search.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-icons-icons\/01-atoms-04-images-icons-icons.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-favicon\/01-atoms-04-images-favicon.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-01-logo-logo\/01-atoms-04-images-01-logo-logo.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-00-image-image\/01-atoms-04-images-00-image-image.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-02-definition\/01-atoms-03-lists-02-definition.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-01-ordered\/01-atoms-03-lists-01-ordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-00-unordered\/01-atoms-03-lists-00-unordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-06-hr\/01-atoms-02-text-text-06-hr.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-05-preformatted-text\/01-atoms-02-text-text-05-preformatted-text.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-03-inline-elements\/01-atoms-02-text-text-03-inline-elements.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-paragraph\/01-atoms-02-text-text-01-paragraph.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote\/01-atoms-02-text-text-01-blockquote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote-alt\/01-atoms-02-text-text-01-blockquote-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-6-heading-6\/01-atoms-02-text-00-headings-heading-6-heading-6.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-5-heading-5\/01-atoms-02-text-00-headings-heading-5-heading-5.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-4-heading-4\/01-atoms-02-text-00-headings-heading-4-heading-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-3-heading-3\/01-atoms-02-text-00-headings-heading-3-heading-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-2-heading-2\/01-atoms-02-text-00-headings-heading-2-heading-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1\/01-atoms-02-text-00-headings-heading-1-heading-1.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1-linked\/01-atoms-02-text-00-headings-heading-1-heading-1-linked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links-link-link\/01-atoms-01-links-link-link.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-02-animations-animations\/00-base-global-02-animations-animations.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-01-colors-colors\/00-base-global-01-colors-colors.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/latest-change.txt","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css.map","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/scripts-styleguide.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/video-with-overlay.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/_video-with-overlay.scss"],"error_details":"","internal_reason":""}],"result":"aborted","site_id":"f8959ca9-1f8f-46bc-8539-8ffcf95e273f","started_at":1512768729.2461,"trace_id":"3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00","user_id":"94f7f8d7-5b27-4586-8651-53b3db9bba40","workflow_id":"3ebefe98-dc5f-11e7-9f25-42010a800153","id":"3ec3b1f4-dc5f-11e7-9f25-42010a800153","key":"1512766800","queued_time":2.1457672119141e-6,"host":null,"phase":"finished","created_at":1512768729.1106,"allow_concurrent":false,"run_time":5.4046618938446,"total_time":5.5401818752289,"reason":["CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/html\/styleguide.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/data\/patternlab-data.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-views\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-header-site-header\/03-organisms-site-site-header-site-header.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-footer-site-footer\/03-organisms-site-site-footer-site-footer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-staff-member\/03-organisms-content-types-node-staff-member.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news\/03-organisms-content-types-node-latest-news.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news-featured\/03-organisms-content-types-node-latest-news-featured.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay-video-with-overlay\/02-molecules-video-with-overlay-video-with-overlay.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status-status\/02-molecules-status-status.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-staff\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer-randomizer\/02-molecules-randomizer-randomizer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager-pager\/02-molecules-pager-pager.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature-multimedia-feature\/02-molecules-multimedia-feature-multimedia-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-subnav-subnav\/02-molecules-menus-subnav-subnav.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-main-menu-main-menu\/02-molecules-menus-main-menu-main-menu.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-breadcrumbs-breadcrumbs\/02-molecules-menus-breadcrumbs-breadcrumbs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-latest-news\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title-hero-title\/02-molecules-hero-title-hero-title.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature-full-bleed-feature\/02-molecules-full-bleed-feature-full-bleed-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty-fifty-fifty\/02-molecules-fifty-fifty-fifty-fifty.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote-featured-quote\/02-molecules-featured-quote-featured-quote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats-circle-stats\/02-molecules-circle-stats-circle-stats.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards-cards\/02-molecules-cards-cards.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-_academics-listing-filter\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu-tab-tab\/01-atoms-09-menu-tab-tab.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video\/01-atoms-08-video-video.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video-full\/01-atoms-08-video-video-full.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables-tables\/01-atoms-07-tables-tables.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-04-button-alt-4\/01-atoms-06-buttons-04-button-alt-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-03-button-alt-3\/01-atoms-06-buttons-03-button-alt-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-02-button-alt-2\/01-atoms-06-buttons-02-button-alt-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button\/01-atoms-06-buttons-01-button.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button-alt\/01-atoms-06-buttons-01-button-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-textfields-textfields\/01-atoms-05-forms-textfields-textfields.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-search-search\/01-atoms-05-forms-search-search.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-icons-icons\/01-atoms-04-images-icons-icons.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-favicon\/01-atoms-04-images-favicon.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-01-logo-logo\/01-atoms-04-images-01-logo-logo.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-00-image-image\/01-atoms-04-images-00-image-image.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-02-definition\/01-atoms-03-lists-02-definition.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-01-ordered\/01-atoms-03-lists-01-ordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-00-unordered\/01-atoms-03-lists-00-unordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-06-hr\/01-atoms-02-text-text-06-hr.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-05-preformatted-text\/01-atoms-02-text-text-05-preformatted-text.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-03-inline-elements\/01-atoms-02-text-text-03-inline-elements.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-paragraph\/01-atoms-02-text-text-01-paragraph.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote\/01-atoms-02-text-text-01-blockquote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote-alt\/01-atoms-02-text-text-01-blockquote-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-6-heading-6\/01-atoms-02-text-00-headings-heading-6-heading-6.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-5-heading-5\/01-atoms-02-text-00-headings-heading-5-heading-5.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-4-heading-4\/01-atoms-02-text-00-headings-heading-4-heading-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-3-heading-3\/01-atoms-02-text-00-headings-heading-3-heading-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-2-heading-2\/01-atoms-02-text-00-headings-heading-2-heading-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1\/01-atoms-02-text-00-headings-heading-1-heading-1.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1-linked\/01-atoms-02-text-00-headings-heading-1-heading-1-linked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links-link-link\/01-atoms-01-links-link-link.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-02-animations-animations\/00-base-global-02-animations-animations.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-01-colors-colors\/00-base-global-01-colors-colors.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/latest-change.txt","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css.map","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/scripts-styleguide.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/video-with-overlay.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/_video-with-overlay.scss"],"error_details":["CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/html\/styleguide.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/data\/patternlab-data.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-views\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-header-site-header\/03-organisms-site-site-header-site-header.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-footer-site-footer\/03-organisms-site-site-footer-site-footer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-staff-member\/03-organisms-content-types-node-staff-member.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news\/03-organisms-content-types-node-latest-news.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news-featured\/03-organisms-content-types-node-latest-news-featured.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay-video-with-overlay\/02-molecules-video-with-overlay-video-with-overlay.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status-status\/02-molecules-status-status.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-staff\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer-randomizer\/02-molecules-randomizer-randomizer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager-pager\/02-molecules-pager-pager.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature-multimedia-feature\/02-molecules-multimedia-feature-multimedia-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-subnav-subnav\/02-molecules-menus-subnav-subnav.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-main-menu-main-menu\/02-molecules-menus-main-menu-main-menu.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-breadcrumbs-breadcrumbs\/02-molecules-menus-breadcrumbs-breadcrumbs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-latest-news\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title-hero-title\/02-molecules-hero-title-hero-title.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature-full-bleed-feature\/02-molecules-full-bleed-feature-full-bleed-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty-fifty-fifty\/02-molecules-fifty-fifty-fifty-fifty.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote-featured-quote\/02-molecules-featured-quote-featured-quote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats-circle-stats\/02-molecules-circle-stats-circle-stats.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards-cards\/02-molecules-cards-cards.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-_academics-listing-filter\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu-tab-tab\/01-atoms-09-menu-tab-tab.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video\/01-atoms-08-video-video.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video-full\/01-atoms-08-video-video-full.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables-tables\/01-atoms-07-tables-tables.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-04-button-alt-4\/01-atoms-06-buttons-04-button-alt-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-03-button-alt-3\/01-atoms-06-buttons-03-button-alt-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-02-button-alt-2\/01-atoms-06-buttons-02-button-alt-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button\/01-atoms-06-buttons-01-button.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button-alt\/01-atoms-06-buttons-01-button-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-textfields-textfields\/01-atoms-05-forms-textfields-textfields.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-search-search\/01-atoms-05-forms-search-search.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-icons-icons\/01-atoms-04-images-icons-icons.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-favicon\/01-atoms-04-images-favicon.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-01-logo-logo\/01-atoms-04-images-01-logo-logo.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-00-image-image\/01-atoms-04-images-00-image-image.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-02-definition\/01-atoms-03-lists-02-definition.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-01-ordered\/01-atoms-03-lists-01-ordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-00-unordered\/01-atoms-03-lists-00-unordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-06-hr\/01-atoms-02-text-text-06-hr.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-05-preformatted-text\/01-atoms-02-text-text-05-preformatted-text.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-03-inline-elements\/01-atoms-02-text-text-03-inline-elements.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-paragraph\/01-atoms-02-text-text-01-paragraph.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote\/01-atoms-02-text-text-01-blockquote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote-alt\/01-atoms-02-text-text-01-blockquote-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-6-heading-6\/01-atoms-02-text-00-headings-heading-6-heading-6.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-5-heading-5\/01-atoms-02-text-00-headings-heading-5-heading-5.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-4-heading-4\/01-atoms-02-text-00-headings-heading-4-heading-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-3-heading-3\/01-atoms-02-text-00-headings-heading-3-heading-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-2-heading-2\/01-atoms-02-text-00-headings-heading-2-heading-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1\/01-atoms-02-text-00-headings-heading-1-heading-1.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1-linked\/01-atoms-02-text-00-headings-heading-1-heading-1-linked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links-link-link\/01-atoms-01-links-link-link.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-02-animations-animations\/00-base-global-02-animations-animations.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-01-colors-colors\/00-base-global-01-colors-colors.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/latest-change.txt","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css.map","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/scripts-styleguide.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/video-with-overlay.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/_video-with-overlay.scss"],"internal_reason":["CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/html\/styleguide.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/data\/patternlab-data.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-views\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-header-site-header\/03-organisms-site-site-header-site-header.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-footer-site-footer\/03-organisms-site-site-footer-site-footer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-staff-member\/03-organisms-content-types-node-staff-member.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news\/03-organisms-content-types-node-latest-news.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news-featured\/03-organisms-content-types-node-latest-news-featured.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay-video-with-overlay\/02-molecules-video-with-overlay-video-with-overlay.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status-status\/02-molecules-status-status.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-staff\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer-randomizer\/02-molecules-randomizer-randomizer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager-pager\/02-molecules-pager-pager.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature-multimedia-feature\/02-molecules-multimedia-feature-multimedia-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-subnav-subnav\/02-molecules-menus-subnav-subnav.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-main-menu-main-menu\/02-molecules-menus-main-menu-main-menu.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-breadcrumbs-breadcrumbs\/02-molecules-menus-breadcrumbs-breadcrumbs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-latest-news\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title-hero-title\/02-molecules-hero-title-hero-title.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature-full-bleed-feature\/02-molecules-full-bleed-feature-full-bleed-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty-fifty-fifty\/02-molecules-fifty-fifty-fifty-fifty.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote-featured-quote\/02-molecules-featured-quote-featured-quote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats-circle-stats\/02-molecules-circle-stats-circle-stats.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards-cards\/02-molecules-cards-cards.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-_academics-listing-filter\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu-tab-tab\/01-atoms-09-menu-tab-tab.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video\/01-atoms-08-video-video.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video-full\/01-atoms-08-video-video-full.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables-tables\/01-atoms-07-tables-tables.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-04-button-alt-4\/01-atoms-06-buttons-04-button-alt-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-03-button-alt-3\/01-atoms-06-buttons-03-button-alt-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-02-button-alt-2\/01-atoms-06-buttons-02-button-alt-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button\/01-atoms-06-buttons-01-button.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button-alt\/01-atoms-06-buttons-01-button-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-textfields-textfields\/01-atoms-05-forms-textfields-textfields.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-search-search\/01-atoms-05-forms-search-search.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-icons-icons\/01-atoms-04-images-icons-icons.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-favicon\/01-atoms-04-images-favicon.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-01-logo-logo\/01-atoms-04-images-01-logo-logo.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-00-image-image\/01-atoms-04-images-00-image-image.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-02-definition\/01-atoms-03-lists-02-definition.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-01-ordered\/01-atoms-03-lists-01-ordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-00-unordered\/01-atoms-03-lists-00-unordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-06-hr\/01-atoms-02-text-text-06-hr.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-05-preformatted-text\/01-atoms-02-text-text-05-preformatted-text.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-03-inline-elements\/01-atoms-02-text-text-03-inline-elements.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-paragraph\/01-atoms-02-text-text-01-paragraph.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote\/01-atoms-02-text-text-01-blockquote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote-alt\/01-atoms-02-text-text-01-blockquote-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-6-heading-6\/01-atoms-02-text-00-headings-heading-6-heading-6.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-5-heading-5\/01-atoms-02-text-00-headings-heading-5-heading-5.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-4-heading-4\/01-atoms-02-text-00-headings-heading-4-heading-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-3-heading-3\/01-atoms-02-text-00-headings-heading-3-heading-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-2-heading-2\/01-atoms-02-text-00-headings-heading-2-heading-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1\/01-atoms-02-text-00-headings-heading-1-heading-1.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1-linked\/01-atoms-02-text-00-headings-heading-1-heading-1-linked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links-link-link\/01-atoms-01-links-link-link.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-02-animations-animations\/00-base-global-02-animations-animations.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-01-colors-colors\/00-base-global-01-colors-colors.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/latest-change.txt","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css.map","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/scripts-styleguide.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/video-with-overlay.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/_video-with-overlay.scss"],"trace_log_url":"https:\/\/app.logz.io\/#\/dashboard\/kibana?kibanaRoute=discover%3F_a%3D(query:(query_string:(analyze_wildcard:!t,query:%27trace_id:3eae3ea0-dc5f-11e7-92d2-c1328ba8eb00%27)))%26_g%3D(refreshInterval:(display:Off,pause:!f,value:0),time:(from:%272017-12-08T21:27:09.110578Z%27,mode:quick,to:%272017-12-08T21:37:14.650760Z%27))","type":"merge_code_from_environment","build_url":null,"messages":{"2017-12-08T21:32:17.325928":{"message":["CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/html\/styleguide.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/styleguide\/data\/patternlab-data.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-views\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-header-site-header\/03-organisms-site-site-header-site-header.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-site-site-footer-site-footer\/03-organisms-site-site-footer-site-footer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-staff-member\/03-organisms-content-types-node-staff-member.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked\/03-organisms-content-types-node-news-listing-stacked-node-news-listing-stacked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news\/03-organisms-content-types-node-latest-news.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-latest-news-featured\/03-organisms-content-types-node-latest-news-featured.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing\/03-organisms-content-types-node-fellowship-listing-node-fellowship-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing\/03-organisms-content-types-node-dept-program-listing-node-dept-program-listing.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-video-with-overlay-video-with-overlay\/02-molecules-video-with-overlay-video-with-overlay.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-status-status\/02-molecules-status-status.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-staff\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-randomizer-randomizer\/02-molecules-randomizer-randomizer.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-pager-pager\/02-molecules-pager-pager.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-multimedia-feature-multimedia-feature\/02-molecules-multimedia-feature-multimedia-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-tabs-tabs\/02-molecules-menus-tabs-tabs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-subnav-subnav\/02-molecules-menus-subnav-subnav.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-main-menu-main-menu\/02-molecules-menus-main-menu-main-menu.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-menus-breadcrumbs-breadcrumbs\/02-molecules-menus-breadcrumbs-breadcrumbs.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-latest-news\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-hero-title-hero-title\/02-molecules-hero-title-hero-title.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-full-bleed-feature-full-bleed-feature\/02-molecules-full-bleed-feature-full-bleed-feature.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-fifty-fifty-fifty-fifty\/02-molecules-fifty-fifty-fifty-fifty.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-featured-quote-featured-quote\/02-molecules-featured-quote-featured-quote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-circle-stats-circle-stats\/02-molecules-circle-stats-circle-stats.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-cards-cards\/02-molecules-cards-cards.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/02-molecules-_academics-listing-filter\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-09-menu-tab-tab\/01-atoms-09-menu-tab-tab.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video\/01-atoms-08-video-video.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-08-video-video-full\/01-atoms-08-video-video-full.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-07-tables-tables\/01-atoms-07-tables-tables.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-04-button-alt-4\/01-atoms-06-buttons-04-button-alt-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-03-button-alt-3\/01-atoms-06-buttons-03-button-alt-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-02-button-alt-2\/01-atoms-06-buttons-02-button-alt-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button\/01-atoms-06-buttons-01-button.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-06-buttons-01-button-alt\/01-atoms-06-buttons-01-button-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-textfields-textfields\/01-atoms-05-forms-textfields-textfields.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-select-select\/01-atoms-05-forms-select-select.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-search-search\/01-atoms-05-forms-search-search.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-radio-radio\/01-atoms-05-forms-radio-radio.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.markup-only.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-05-forms-checkbox-checkbox\/01-atoms-05-forms-checkbox-checkbox.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-icons-icons\/01-atoms-04-images-icons-icons.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-favicon\/01-atoms-04-images-favicon.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-01-logo-logo\/01-atoms-04-images-01-logo-logo.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-04-images-00-image-image\/01-atoms-04-images-00-image-image.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-02-definition\/01-atoms-03-lists-02-definition.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-01-ordered\/01-atoms-03-lists-01-ordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-03-lists-00-unordered\/01-atoms-03-lists-00-unordered.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-06-hr\/01-atoms-02-text-text-06-hr.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-05-preformatted-text\/01-atoms-02-text-text-05-preformatted-text.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-03-inline-elements\/01-atoms-02-text-text-03-inline-elements.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-paragraph\/01-atoms-02-text-text-01-paragraph.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote\/01-atoms-02-text-text-01-blockquote.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-text-01-blockquote-alt\/01-atoms-02-text-text-01-blockquote-alt.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-6-heading-6\/01-atoms-02-text-00-headings-heading-6-heading-6.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-5-heading-5\/01-atoms-02-text-00-headings-heading-5-heading-5.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-4-heading-4\/01-atoms-02-text-00-headings-heading-4-heading-4.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-3-heading-3\/01-atoms-02-text-00-headings-heading-3-heading-3.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-2-heading-2\/01-atoms-02-text-00-headings-heading-2-heading-2.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1\/01-atoms-02-text-00-headings-heading-1-heading-1.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-02-text-00-headings-heading-1-heading-1-linked\/01-atoms-02-text-00-headings-heading-1-heading-1-linked.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/01-atoms-01-links-link-link\/01-atoms-01-links-link-link.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global\/index.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-02-animations-animations\/00-base-global-02-animations-animations.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/patterns\/00-base-global-01-colors-colors\/00-base-global-01-colors-colors.html","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/pattern-lab\/public\/latest-change.txt","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css.map","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/style.css","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/dist\/scripts-styleguide.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/video-with-overlay.js","CONFLICT (content): Merge conflict in web\/themes\/custom\/stanford_hs\/components\/_patterns\/02-molecules\/video-with-overlay\/_video-with-overlay.scss"],"level":"ERROR"}}}}
Status Code: 200
PHP Warning:  strtr() expects parameter 1 to be string, array given in /Users/dave/.composer/global/pantheon-systems/terminus/vendor/pantheon-systems/terminus/src/Exceptions/TerminusException.php on line 73

Warning: strtr() expects parameter 1 to be string, array given in /Users/dave/.composer/global/pantheon-systems/terminus/vendor/pantheon-systems/terminus/src/Exceptions/TerminusException.php on line 73
 [error]

The problem is that the exception message is an array, not a string.

Site info

--------------- ---------------------------------------------------------------------------------------
  ID              f8959ca9-1f8f-46bc-8539-8ffcf95e273f
  Name            stanford-hs
  Label           Stanford H&S
  Created         2017-07-17 23:42:02
  Framework       drupal8
  Organization    2d9c0d71-3bc6-4f3a-8517-d4de231ed69a
  Service Level   pro
  Max Multidevs   10
  Upstream        cbdeadf3-669f-4848-94f5-c2354f256de8: https://github.com/Advomatic/advostarter-d8.git
  PHP Version     5.5
  Holder Type     user
  Holder ID       5e4c2207-a2b5-4e86-961d-d35522641447
  Owner           5e4c2207-a2b5-4e86-961d-d35522641447
  Is Frozen?      false
 --------------- ---------------------------------------------------------------------------------------
arrubiu commented 6 years ago

It seems like #1765

dalin- commented 6 years ago

FWIW this is happening for other devs on our team working on different sites.

Steps to reproduce:

  1. Create a multi-dev
  2. Change code both on the multi-dev and master such that there will be a merge conflict.
  3. terminus multidev:merge-from-dev site.multidev
dalin- commented 6 years ago

Well if I hack things to convert the array to a string:

        if (is_array($message)) {
          $message = implode(' | ', $message);
        }

Then I don't get a PHP error, but the Terminus command just fails silently.

dalin- commented 6 years ago

Well if I hack things to convert the array to a string:

        if (is_array($message)) {
          $message = implode(' | ', $message);
        }

Then I don't get a PHP error and instead get the expected error from the terminus command:

CONFLICT (content): Merge conflict in web/sites/default/config/search_api.index.stanford_hs_index.yml

Looks like there was only one element in the array.

joel-travieso commented 6 years ago

Any progress on this? Having the same problem here.

TeslaDethray commented 5 years ago

The bug has been reopened as #1839