Quantcast
Channel: Team Foundation Server - General forum
Viewing all articles
Browse latest Browse all 6687

Code Merging Issues TFS 2010

$
0
0

Hi Guys

                We are facing some critical issues in Merging Code of TFS 2010. Before i report anything , i just want to confirm :

1) Is it necessary to get latest code of target branch before start merging. What will happen if i ignore to get Latest and merge??

>>>>>>>>>>>>>>>>>>>>>>>>>>>>

What do we mean byGET LATEST inTFS 2010??Kindly explain. How it works if i am Doing get latest and Files already exist on my Work space.

>>>>>>>>>>>>>>>>>>>>>>>>>>>>

2) Is it possible TFS may ignore file conflicts and merge wrongly.

At the end , please share BEST PRACTICES of Merging Code in TFS. 

Waseem Bukhari

CMer



WSBukhari


Viewing all articles
Browse latest Browse all 6687

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>