In Team System, I have a file that was changed in branch ServicePack\2.1 (which was branched from Integration) and I don't want to merge it to Integration. How do I delete it from the potential changeset list when I try to merge selected changesets?
Use baseless merge to merge items that are not directly branched from each other. To perform a baseless merge, you must use the tf merge command. When you perform a baseless merge, Team Foundation does not have any information about the relationship of the files in the branches.
Assuming you want to remove candidate #1234...
tf merge ServicePack\2.1 Integration /r /version:1234~1234 /discard tf checkin
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