Team Foundation - Version Control Server Team

Based upon customer feedback(both external and internal), we have made a number of improvements to the merging experience in Orcas. Below are some of the most significant changes: 1. I described how to handle namespace conflicts while merging in my previous Read More...

I thought I would talk about namespace conflicts while merging. A namespace conflict occurs when 2 items try to occupy the same slot in the tree. The main reasons for namespace conflicts during merge are: - Items with the same name are created in 2 branches Read More...