File-level branch merge

[tomt84]

Hi

If I want to merge changes to a single file in a branch back to the "trunk" of that branch, is there a good way to do so with Vault? I only seem to be able to do that with a whole folder.

We're at v4.1.3.18336.

Thanks
Tom

[jeffhostetler]

If you don't need to see the common ancestor, you could launch DiffMerge
and then open the branch version of the file in the left panel and the trunk
version in the right panel. Apply changes to the trunk panel and save.

Be sure to checkout the trunk version first.

If you need the common ancestor to help line things up, let us know and
we'll explain how to get a normal 3-way merge window started.


You'll find DiffMerge inside the Vault folder in the Start Menu.

jeff

[tomt84]

That will do the job nicely, thanks very much for the pointer. Obvious in retrospect.

[jeffhostetler]

Great. Glad to be of help.

If you do decide you want the common ancestor, I found an earlier post
that explains how to get that:
http://support.sourcegear.com/viewtopic ... 560#p45560

jeff

[tomt84]

Spam I presume?

Perhaps we can ban this user and delete their posts..

[jeffhostetler]

I've deleted/banned that user. It looks like they/it posted 10 or 12 similar posts in < 2 minutes.

Thanks for the note.

jeff