How do I "Take Source Branch Version" for all conflicts in TFS 2008 on Visual Studio 2010?

Question

The closest thing I see to what I want is "AutoResolve All". I don't want to AutoMerge though.

In Visual Studio 2008 I could say I wanted to have the source override on all or the target on all.

Where is this option in 2010? Did they take it away? It looks like my only option is to click "Take Source Branch Version" on all 70 files one by one.

Answer 1

Check out the TF.EXE command here: http://msdn.microsoft.com/en-us/library/6yw3tcdy(VS.100).aspx

It looks like you'll want to do:

tf.exe resolve ..... /auto:KeepYours will do what you want. My suggestion is to do the resolve, then check your branch and make sure that you have what you expect before you check in.

If the KeepYours isn't giving you what you want, use the TakeTheirs