Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

I can't unshelve changes from one branch to another

Tags:

tfs

unshelve

I'm using tfpt tool for moving a shelveset from one branch to another. I've read some stackoverflow questions about it but neither seems to fit to my problem. I'm running the command like this:

tfpt unshelve "my shelveset name" /migrate /source:source_brach /target:target_branch

When I'm doing this I'm getting an error like this example:

The change to filen_name_with_path cannot be unshelved because the server path is not mapped in the local workspace

like image 372
Rafal_Koscinski Avatar asked Feb 04 '14 10:02

Rafal_Koscinski


People also ask

How do you Unshelve changes in TFS?

You can shelve pending changes (like a local check in) by right-clicking a file/project/folder/etc. and selecting Shelve Pending Changes. If you want to get your shelveset back or get other people's shelved changes. Go to File -> Source Control -> Unshelve Pending Changes….

How do I merge Shelveset to local?

You can perform the unshelve and merge together by using the tfpt unshelve command from a Visual Studio command prompt. Make sure your active directory is a directory that is mapped to your local workspace otherwise you may see "Unable to identify workspace".


1 Answers

Make sure your workspace mapping includes both branches. Do a get latest on both branches first to test this is setup right.

like image 150
Dylan Smith Avatar answered Sep 29 '22 02:09

Dylan Smith