This project has moved and is read-only. For the latest updates, please go here.

Exclude items from Branch Merging

Sep 13, 2010 at 6:28 PM

Say I have the following two branches (main is parent to Release1.0

$/Project1/Main/Documentation

$/Project1/Release1.0/Documentation

I add a file, a folder or any number of objects to the Release1.0 branch.   Those changes I never want to get to the Main branch.  Is there a way I can exclude them from consideration when mergeing?   I still want all other files to merge accordingly.   I just want to exlude a subset.

Oct 20, 2010 at 12:07 AM

Have you looked into cloaking. It may be possible to cloak the documetation folder in your workspace. I think it will then be possible to merge Release 1.0 back to Main without including the documentation. I haven't tried it, however.

Regards,
Bill Heys
VS ALM Ranger

Oct 20, 2010 at 12:37 AM

Cloaking works on the client side and regardless of cloaked folders the merge will still do a get of the cloaked folders and or fail the merge. My recommendation would be to use labels and remove the contents from the labels...and do the merge via the command line...until we have merge by label back in the product when TFS 2010 SP1 ships mid next year.