TFS - TFPT - how to resolve conflicts when applying a shelveset from a branch to another?

Question

I'm trying to apply a shelveset from a branch to another, following these steps:

http://benjii.me/2014/04/move-shelveset-to-different-branch-in-tfs/

But when TFS opens a screen for me to resolve conflicts, it's impossible to work, because my shelveset has more than 700 files. I can't specify the desired merge option for each one.

What I need is to specify a default merge action for all the unresolved conflicted files at once.

Is it possible? If so, how can we do it?

Select all (control-A), then click the resolution strategy you want to apply. — Edward Thomson, Oct 26 '15 at 12:22
@EdwardThomson, it doesn't work for TFS 2012. Have you tried it? — , Oct 27 '15 at 18:15

score 0 · Answer 1 · edited May 23 '17 at 11:44

0

Unfortunately there's no way to do so through power tools. When you are moving a shelveset of multiple files between branches, you must need to resolve the conflicts produced manually.

However there is another way to move a shelveset to another branch. Please see the answer from Simon_Weaver Can I unshelve to a different branch in tfs 2008?

edited May 23 '17 at 11:44

Community

1
1

answered Oct 26 '15 at 10:34

PatrickLu-MSFT

49,478
5
35
62

TFS - TFPT - how to resolve conflicts when applying a shelveset from a branch to another?

1 Answers1