Visual Studio 2012 Branching Bug?

Wednesday, February 27, 2013

An unusual bug discovered on a customer site related to Visual Studio + TFS 2012 branching  I've posted it on connect: #780177: A newly created branch contains historical partial merges on a server upgraded from 2010 to 2012 causing unexpected conflicts   The odd part is, the 2nd workaround we've found exposes unexpected difference when running from Visual Studio UI, where tf.exe command does not seems to reproduce the problem.   Workarounds 1. Running "tf.exe merge /recursive /discard <parent> <child>" seems to fix the issue. 2. Use the command line...
one comment