Conflict resolution in TFS source control  
Author Message
laboremus





PostPosted: Team Foundation Server - Setup, Conflict resolution in TFS source control Top

I couldn't findanswer to one question from few books I've read so far.

In Subversion if I am getting the latest version from source control it will let me know that there are conflicts if somebody edited the file I'm working on and let's me do manual merging file-by-file. Does TFS VC do this In the books this problem is smoofly avoided and the only pictures are usually stupid VSS 6.0-like relpacement.

I have a solution with 12 projects and total of 300 files and I don't want to waste time checking out one file at the time.



Visual Studio Team System36  
 
 
Buck Hodges





PostPosted: Team Foundation Server - Setup, Conflict resolution in TFS source control Top

Yes. In TFS version control, you will get conflicts when you try to checkin or get latest. You will then be shown the conflict resolution dialog to resolve your changes with the latest changes.

Buck