How to merge branches in VSS?

Question

i'm trying to merge a branch in Visual SourceSafe 6.

Here you see the bug in the 'main line' code base:

A hotfix branch was created, and the file was fixed:

Now it's time to merge the hotfix back into the main line development. i select the file i want to merge, and hit the SourceSafe → Merge Branches... menu option:

With the merge complete, i confirm that the main line now contains the hotfix, which it does not:

So what is the proper technique to merge branches in Visual SourceSafe 6?

Answer 1

Select the file in trunk, execute merge branches, in the dialog, select branch file, click merge.

Answer 2

Select the file you want to merge into, i.e. the mainline file. Then execute Merge Branches. In the dialog, select the file you want to merge from, i.e. the hotfix file.