Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

How can I remove a merge candidate from the Merge tool in Team System?

Tags:

tfs

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?

like image 937
NotDan Avatar asked Jun 12 '09 21:06

NotDan


People also ask

What is baseless merge in TFS?

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.


1 Answers

Assuming you want to remove candidate #1234...

tf merge ServicePack\2.1 Integration /r /version:1234~1234 /discard tf checkin 
like image 101
Richard Berg Avatar answered Sep 22 '22 14:09

Richard Berg