TFS merge conflicts dialog
When merging conflicts between branches in TFS, there is a dialog for mering multiple conflicts. When you select more conflicts and wish to take either the target branches version or the source version. The Dialog…
Posts tagged with TFS
Source control folder anti-pattern
I ran into this issue at work today. Another team depends on my teams code to create customer specific solutions. Now they have an issue where they have to keep track of which versions are…
Rollback and undo checkin in TFS
I keep forgetting this option in the team system powertools. The rollback command undoes all change sets to a specific point, this is done by reverting the changes. That is it checks out the files…
Independent trunk and MSBuild
A while back I posted a post about a concept I call the Independent trunk. The core concept is that everything required to build a distributable version of a software product is checked in under…
Safe import of .target files
We’ve changed most of our projects to import other .target files. This means that we get allot of warnings about unsafe imports. To eliminate these we can add a registry setting with the file…