{"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":"Merge enhancements in TFS 11","type":"rich","width":600,"height":338,"html":"<blockquote class=\"wp-embedded-content\" data-secret=\"j4rfWQUEhC\"><a href=\"https:\/\/devblogs.microsoft.com\/bharry\/merge-enhancements-in-tfs-11\/\">Merge enhancements in TFS 11<\/a><\/blockquote><iframe sandbox=\"allow-scripts\" security=\"restricted\" src=\"https:\/\/devblogs.microsoft.com\/bharry\/merge-enhancements-in-tfs-11\/embed\/#?secret=j4rfWQUEhC\" width=\"600\" height=\"338\" title=\"&#8220;Merge enhancements in TFS 11&#8221; &#8212; Brian Harry&#039;s Blog\" data-secret=\"j4rfWQUEhC\" frameborder=\"0\" marginwidth=\"0\" marginheight=\"0\" scrolling=\"no\" class=\"wp-embedded-content\"><\/iframe><script type=\"text\/javascript\">\n\/* <![CDATA[ *\/\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\/* ]]> *\/\n<\/script>\n","thumbnail_url":"https:\/\/devblogs.microsoft.com\/bharry\/wp-content\/uploads\/sites\/8\/2011\/08\/2671.DiffSxS_thumb_1AA85A52.png","thumbnail_width":600,"thumbnail_height":375,"description":"Here\u2019s the next post in my series of \u201cDevelopers are raving fans\u201d enhancements coming in TFS 11.\u00a0 My last post was on workspace improvements. One of the things we consistently get customer feedback on in TFS 2010 is that merging is still too complicated and\/or too limited.\u00a0 We\u2019ve made several significant improvements in the coming [&hellip;]"}