Menu
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 unshelve" to move shelvesets to another branch, as you cannot add a source and a target using the new command. I really don't want to have to install VS2015 on my laptop just to move a shelveset. Does anyone know how to do this with VS2017? I'm having a hard time believing this is no longer possible.
Any assistance is greatly appreciated!
662
Using Source Control Explorer in Visual Studio, get the history for any folder or file. Select one or more changesets in the list and right-click your selection. The context menu will now have a 'Merge...' option. Clicking this will give an overview of the selected changesets and files associated with those changesets.
Make sure your active directory is a directory that is mapped to your local workspace otherwise you may see "Unable to identify workspace". When you run the command you'll be presented with a dialog to choose your shelveset. After that, you will receive an additional dialog that allows you to merge conflicting files.
I absolutely agree this is a greatly missed feature in 2017 and up. After too many times of doing this manually, I decided to add it to my (free) Visual Studio Extension called 'MultiMerge'. You can now right-click a shelveset and choose your target branch. There's a VS2017 version and VS2019. Or you can simply choose this extension using Tools and Extentions menu in Visual Studio.
Feel free to rate the extension, and let others find it more quickly:)
199
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
