Allow developers to indicate that certain files should not be merged in a given branch
When working in different branches we often have files that we want to change for a specific branch and then don't ever want those files to merge back to its parent branch. tf merge /discard doesn't work well for this because you have to run it each time you change the file in question. Workspace mappings and cloaks can accomplish this but they are cumbersome and people often forget to use them correctly. it would be nice if we could have a one-click option that could mark a file in a branch such that it would not merge up to its parent.
Thanks for the feedback on this idea. At this time, we’re not planning to improve the discard experience when merging.
TFS Program Manager