{"version":"1.0","provider_name":"Brian Harry&#039;s Blog","provider_url":"https:\/\/devblogs.microsoft.com\/bharry","author_name":"Brian Harry","author_url":"https:\/\/devblogs.microsoft.com\/bharry\/author\/bharry\/","title":"Merging conflicts in the browser","type":"rich","width":600,"height":338,"html":"<blockquote class=\"wp-embedded-content\" data-secret=\"9GFEH7KHXJ\"><a href=\"https:\/\/devblogs.microsoft.com\/bharry\/merging-conflicts-in-the-browser\/\">Merging conflicts in the browser<\/a><\/blockquote><iframe sandbox=\"allow-scripts\" security=\"restricted\" src=\"https:\/\/devblogs.microsoft.com\/bharry\/merging-conflicts-in-the-browser\/embed\/#?secret=9GFEH7KHXJ\" width=\"600\" height=\"338\" title=\"&#8220;Merging conflicts in the browser&#8221; &#8212; Brian Harry&#039;s Blog\" data-secret=\"9GFEH7KHXJ\" frameborder=\"0\" marginwidth=\"0\" marginheight=\"0\" scrolling=\"no\" class=\"wp-embedded-content\"><\/iframe><script>\n\/*! This file is auto-generated *\/\n!function(d,l){\"use strict\";l.querySelector&&d.addEventListener&&\"undefined\"!=typeof URL&&(d.wp=d.wp||{},d.wp.receiveEmbedMessage||(d.wp.receiveEmbedMessage=function(e){var t=e.data;if((t||t.secret||t.message||t.value)&&!\/[^a-zA-Z0-9]\/.test(t.secret)){for(var s,r,n,a=l.querySelectorAll('iframe[data-secret=\"'+t.secret+'\"]'),o=l.querySelectorAll('blockquote[data-secret=\"'+t.secret+'\"]'),c=new RegExp(\"^https?:$\",\"i\"),i=0;i<o.length;i++)o[i].style.display=\"none\";for(i=0;i<a.length;i++)s=a[i],e.source===s.contentWindow&&(s.removeAttribute(\"style\"),\"height\"===t.message?(1e3<(r=parseInt(t.value,10))?r=1e3:~~r<200&&(r=200),s.height=r):\"link\"===t.message&&(r=new URL(s.getAttribute(\"src\")),n=new URL(t.value),c.test(n.protocol))&&n.host===r.host&&l.activeElement===s&&(d.top.location.href=t.value))}},d.addEventListener(\"message\",d.wp.receiveEmbedMessage,!1),l.addEventListener(\"DOMContentLoaded\",function(){for(var e,t,s=l.querySelectorAll(\"iframe.wp-embedded-content\"),r=0;r<s.length;r++)(t=(e=s[r]).getAttribute(\"data-secret\"))||(t=Math.random().toString(36).substring(2,12),e.src+=\"#?secret=\"+t,e.setAttribute(\"data-secret\",t)),e.contentWindow.postMessage({message:\"ready\",secret:t},\"*\")},!1)))}(window,document);\n\/\/# sourceURL=https:\/\/devblogs.microsoft.com\/bharry\/wp-includes\/js\/wp-embed.min.js\n<\/script>\n","thumbnail_url":"https:\/\/devblogs.microsoft.com\/bharry\/wp-content\/uploads\/sites\/8\/2018\/08\/vstsfeature.png","thumbnail_width":716,"thumbnail_height":448,"description":"One of the cool things about having VSTS used across all of Microsoft is that when there&#8217;s some useful missing feature, one of the many teams using it might fill the gap and we get to harvest it and make it available to all VSTS customers.\u00a0 Exactly that has just happened. I&#8217;ve written several times [&hellip;]"}