How to unshelve a shelveset into another branch with TFS
来源:互联网 发布:直播软件露鸟 编辑:程序博客网 时间:2024/05/16 14:47
/*Author : Jiangong SUN*/
If you have made a shelve in one branch, and want to unshelve it to another branch. This article will be helpful for you.
There are some steps to follow:
1. You need to install TFS Power tools in your machine. Or else, you can't use tfpt command.
2. You need to ensure there is no pending changes in all branches in the workspace.
If not, you may get possible errors like:
- Unable to determine the workspace
- An item with the same key has already been added
3. And it's better to delete cache in TFS: C:\Users[USERNAME]\AppData\Local\Microsoft\Team Foundation\4.0\Cache
4. Go to the target branch name
Example :
c:\>d:
d:\>cd D:\wks\XXX\LOCAL_TARGET_BRANCH
5. Run tfpt unshelve command in target branch mapped directory
Example:
D:\wks\XXX\LOCAL_TARGET_BRANCH>tfpt unshelve /migrate "SourceBranchShelveName" /source:"$/PATH/SOURCE_BRANCH" /target:"$/PATH/TARGET_BRANCH"
6. Resolve conflicts
There may have some conflicts in the unselve, you can choose auto merge all or resolve the conflicts one by one.
Hope this helps! Enjoy coding!
References:
http://geekswithblogs.net/TarunArora/archive/2011/06/06/unshelve-shelveset-created-from-one-branch-to-another.aspx
http://benjii.me/2014/04/move-shelveset-to-different-branch-in-tfs/
- How to unshelve a shelveset into another branch with TFS
- How to import existing projects into TFS Visual Studio with GIT ?
- how to rename a git branch
- Git: How To Revert A Branch Merge
- [tfs] How to add report builder into report site
- How to import existing GIT repository into another?
- Ruby, how to shuffle one array into another
- How to copy values of an array into another array
- How to sort an array of hashes into hashes with multiple values for a key?
- How to turn a negative outlook into a positive one
- How to convert a list of tensors into a tensor
- How to invoke a function from another .cpp source file
- [SVN]-How do I relocate a repository to another host?
- TFS - undoing a checkout of another user ...
- How to Push a New Local Branch to a Remote Git Repository
- how to begin with a new project
- How to Do Research With a Professor
- How to build a product with InstallShield
- Flyweight(享元)
- Android开发小技巧
- Android 中对于图片的内存优化方法
- PS可选颜色理解
- linux下几个经常用的功能(命令)
- How to unshelve a shelveset into another branch with TFS
- IOS-文字色彩UIColor
- 成功企业是“架构”出来的
- 微软STC实习生面试
- Proxy(代理)
- 黑马程序员_线程高级_多线程,同步,互斥,线程数据共享
- CCClippingNode(Clip修剪 可以实现新手引导遮罩、滚动字幕。。渲染child时仅渲染模板透明度值大于透明度阀值的像素点.默认透明度阀值 =1)
- 使用UIWebView加载来自NetWork、Project、Documents的html、javascript文件
- 大图用 imageWithContentsOfFile 小图用imageNamed