Changeset Rollback Problem ..

Consider the following scenario:

After Changeset #1
line 1: nothing
line 2: nothing
line 3: nothing

After Changeset #2
line 1: Hello World
line 2: nothing
line 3: nothing

After Changeset #3
line 1: Hello World
line 2: Hello Planet
line 3: nothing

After Changeset #4
line 1: Hello World
line 2: Hello Planet
line 3: Hello Universe

If I try to rollback Changeset #3 at this stage using TFPT (RTM version), it says that a 3-way merge is needed, which is correct, since line 3 needs to be reconciled.

But when I click Merge button, instead of showing me the 3-way merge window, it goes ahead and does an automatic Merge .. ?

Pls advise. Thanks in advance.

[760 byte] By [jamil] at [2008-3-6]
# 1

It performed the merge automatically because the text changes didn't conflict. If there had been a text conflict, the manual merge tool would be launched. I'm not sure that there's a way to force the manual merge tool in this case. I'll have to check.

Buck

BuckHodges at 2007-9-9 > top of Msdn Tech,Visual Studio Team System,Team Foundation Server - Version Control...

Visual Studio Team System

Site Classified