Merging and resolving conflicts
Sometimes I hear people that does not like the way TFS manages merge conflicts, and quite all of the time the problem is that they does not like the Visual Studio Integrated tool to merge two files. I must admit that I do not like that tool too, but this is not related to TFS, because conflicts resolution is an operation that must be done by people locally.
For those people, like me, that work a lot with subversion, probably winmerge is the right tool to resolve merge conflicts, and it is really simple to instruct Visual Studio to use winmerge instead of the standard tool to merge two files. If you want to spend some money, BeyondCompare is really a great tool, suggested to me by my dear friend Janky.
Remember, conflicts resolution is an operation that has nothing to do with your Source Control System :P.