Menu
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?
888
You cannot merge multiple changesets in one go, unless the changesets are in sequence. Using the tf command line tool you specify a range of versions by separating the version with a tilde character. In this case the changes 162987 and 162967 will also be included.
Right-click the changeset for which you want information, and select Changeset Details... The Details for Changeset dialog box appears. In the Details for Changeset dialog box, view the change types that were added and any comments, work items, check-in notes, and policy warnings that are associated with the changeset.
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.
167
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
