Since they have supposedly integrated most of the Power Tools functionality into VS2017, the new command \"tf unshelve\" does not work the same as the old command \"tfpt unshelv
Another WORKAROUND...
This keeps changes from changeset 2 and rolls back the original branch.
This process may not work for every company and their policies but it does work. I don't like it but sometimes it is necessary.