Where do I fix a production defect?

Question from a customer of the Rangers Branching Guidance (http://tfsbranchingguideiii.codeplex.com ) “My company has a major release every 3 months.  In between major releases we have monthly maintenance releases. (Similar to the "Advanced Branching Plan") Our monthly release usually is limited to high priority bugs based on customer complaints and business needs. Scenario: Lets say…

1

My source and target files are different, but merge tells me there are no changes to merge

When TFS does a merge, it bases the merge on prior merge history, not on the actual contents of the source and target files. There are many reasons why this is necessary, some of which will become apparent by reading this post. For example, a merge may result in a conflict (changes made to both…


Project Dependencies will break with branching if not done properly

In the February 2011 issue of MSDN Magazine, I wrote an article on Shared Code (or code dependencies as some call it). Often I see a common problem with relative references to dependent assemblies or projects. If relative references are not created properly for a solution that is branched, the relative references may break. Since…

1