{"id":13846,"date":"2018-01-29T10:26:35","date_gmt":"2018-01-29T15:26:35","guid":{"rendered":"https:\/\/blogs.msdn.microsoft.com\/bharry\/?p=13845"},"modified":"2019-02-27T03:48:21","modified_gmt":"2019-02-27T03:48:21","slug":"merging-conflicts-in-the-browser","status":"publish","type":"post","link":"https:\/\/devblogs.microsoft.com\/bharry\/merging-conflicts-in-the-browser\/","title":{"rendered":"Merging conflicts in the browser"},"content":{"rendered":"<p>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.<\/p>\n<p>I&#8217;ve written several times about GVFS and the adoption of Git by our Windows team (Actually WDG &#8211; Windows and Devices Group).\u00a0 It&#8217;s a big organization managing a lot of teams, branches and releases at the same time.\u00a0 Because of this they have a lot of code flowing around and need to merging the various streams of development.\u00a0 To help with this, they built a VSTS extension that enables you to do merge conflict resolution directly in the browser, as part of the Pull Request UI, validate it with the PR build and tests and commit it without having to get and enlistment and do everything locally.\u00a0 Although it was designed and tested for extremely large code bases, it works for *any* Git repo on VSTS regardless of size and regardless off whether or not you use GVFS.\u00a0 It&#8217;s a really nice experience that&#8217;s been refined over the past several months of use internally.<\/p>\n<p>I hope you like it.\u00a0 Check it out:\n<a href=\"https:\/\/marketplace.visualstudio.com\/items?itemName=ms-devlabs.conflicts-tab\">Pull Request merge conflict extension<\/a><\/p>\n<p>Brian<\/p>\n","protected":false},"excerpt":{"rendered":"<p>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;]<\/p>\n","protected":false},"author":244,"featured_media":14617,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[1],"tags":[9,21],"class_list":["post-13846","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-uncategorized","tag-vs-team-services","tag-vsts"],"acf":[],"blog_post_summary":"<p>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;]<\/p>\n","_links":{"self":[{"href":"https:\/\/devblogs.microsoft.com\/bharry\/wp-json\/wp\/v2\/posts\/13846","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/devblogs.microsoft.com\/bharry\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/devblogs.microsoft.com\/bharry\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/bharry\/wp-json\/wp\/v2\/users\/244"}],"replies":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/bharry\/wp-json\/wp\/v2\/comments?post=13846"}],"version-history":[{"count":0,"href":"https:\/\/devblogs.microsoft.com\/bharry\/wp-json\/wp\/v2\/posts\/13846\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/bharry\/wp-json\/wp\/v2\/media\/14617"}],"wp:attachment":[{"href":"https:\/\/devblogs.microsoft.com\/bharry\/wp-json\/wp\/v2\/media?parent=13846"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/bharry\/wp-json\/wp\/v2\/categories?post=13846"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/bharry\/wp-json\/wp\/v2\/tags?post=13846"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}