Geek asks and answers

"tf get" when the file has local changes and a new version is available

I prefer to use the command line with TFS, but I'm not sure how to execute the equivalent of what VS2010 does when you have local changes to the file and a new version is available. VS asks if you want to unite, etc.

Is there an automerge way when I do tf getin a file in which I made local changes and a new version of the file is available?

+3
source share
1 answer

If you have pending changes to the file, and the server has newer content, then when you run tf get, you will receive a notification of conflicts and the content will not be downloaded.

tf resolve, , , Visual Studio, , .

( tf Unix), tf resolve. , :

tf resolve $/Project/File.txt /auto:AutoMerge
+6

More articles:


All Articles