Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
My Test and Dev branches are out of sync. The Changesets I want have already been merged through. I want to simply take what is in the Development subdirectory and push it straight into Test as it stands, overwriting whatever test has. Is this possible?
e.g.
$\dev\blah\subdirectory => $\test\blah\subdirectory
I know I can take each file I want and manually copy from Dev => Test then check in. There are 10 files so I prefer not to do it that way. Does TFS offer any means to accomplish this task?
From a visual studio command prompt change directories to your workspace that you want to run the merge in and then run “tf merge sourcebranch targetbranch /r /force”. That will ignore merge history and copy the content like you want.