Merge Branches - should missing files be added?

[cdaniel]

I can't give a detailed repro (because I wasn't paying close enough attention), but I did a merge between two branches in our development tree (a few hundred files in a few dozen folders). After the merge, a small number of files which had been added to the source branch were (still) missing from the destination branch.

Now, near as I can tell, there's no mention of the Merge Branches wizard in the Vault Client help at all (at least I couldn't spot it from the Index/TOC). So the question: Should a merge as I described have added files that are in the source branch but not the destination to the destination branch? I sure hope that's the case, 'cause merge branches is not very useful otherwise.

[ericsink]

Yes, those files should have been added. Without more information, I can't diagnose what went wrong.

There are cases where the Merge Branches wizard realizes that it is not safe to add a file, such as when a file of the same name already exists. In these kinds of cases, it detects the need to Add but does not perform the operation automatically, requiring you to confirm.

Anyway, to answer your question, yes, the merge branches wizard handles this case.