CODEWITHSUNDEEP
visual-studiovisual-studio-2010tfs
hyprsleepy
hyprsleepy

Reputation: 1810

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

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.

Upvotes: 18

Views: 10373

Answers (2)

sttech
sttech

Reputation: 459

Select all and click Take Source Version.Note ctrl+A doesn't work. So select the first item, hold shift and select the last item.

In the Resolve conflicts window

Upvotes: 45

Robaticus
Robaticus

Reputation: 23157

Check out the TF.EXE command here.

tf.exe resolve ..... /auto:TakeTheirs will "Take Source Branch Version." My suggestion is to do the resolve, then check your branch and make sure that you have what you expect before you check in.

tf.exe resolve .... /auto:KeepTheirs will "Keep Target Branch Version"

Upvotes: 14

Related Questions