Shelvesets are a really useful concept in TFS, and you should be aware that thanks to Power Tools you can even do a Merge during an Unshelve in case of conflicts. As an example suppose this simple and stupid scenario, you have this code. Figure 1: Original Code Now lets generate a conflict with Shelveset; [...]
Continue reading about TFS Pills: merging conflicts during unshelve.
