Merge two versions of a file

[NoWay]

Hi all

First I apologize if this is trivial but I'm a beginner if it comes to Vault and Source Control at all.
Let's suppouse I have a file with two quite complicated functions (Func1 and Func2) in some class file (lets call it MyClass.vb). This is my 1st version of this file. Then I make some major changes to Func1 in MyClass.vb. Then I commit my changes to repository with CheckIn (version 2 of MyClass.vb). Then some time later I make some major changes in Func2 and also CheckIn (version 3 of MyClass.vb). Now for example I realize that changes made to Func1 broke my whole App logic so I would like to go back to my first version of Func1 but retaining current version of Func2. How do I do that in Vault?
I suppouse I could view each version in history and do some paste/copy operations to the current file but the example I gave is just simplification. What if I can not find out what exactly (which parts of code) was changed between versions? I would like to use some 3 way merge proccess. Probably DiffMerge window could be helpful but I cant make it work.

Thanks

Maciek

[lbauer]

You could Show History on the file, select the two versions and diff to see the changes. You can't merge from this however, since these are historical versions.

To actually modify the files, you can select version 1 from history, and do a get into a non-working directory. Get the current version into the working directory. Make them both writeable, then diff the version in your working folder usings the option to diff against "Any local folder/file." You can move your changes into the current version.