TFS Merge Pain and Suffering

If you're part of a team that's using Team Foundation Server for source control, you've probably felt the pain related to merge conflicts. I'm sure you've seen this window before: »