Brian Harry's Blog

Everything you want to know about Azure DevOps and Farming

Merging conflicts in the browser

One of the cool things about having VSTS used across all of Microsoft is that when there'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.  Exactly that has just happened. I've written several times about GVFS and the adoption of Git by our...