Merging in Vault

[dland]

I'm finding one aspect of Vault's branch merge wizard a bit confusing. I have trouble understanding why it displays a listing of change sets for the user pick from in order to merge a branch’s changes back into the mainline. What I don't like about it is that a single change set could contain changes to many files, and, conversely, one file can have many change sets associated with it. It seems that if you made a lot of changes in the branch and had to merge them in all at once, you could be confronted with a lot of change sets and it might be difficult to determine which ones to merge in. I haven't come up with any test cases in which merging all the change sets in causes any problems, but I'm wondering if there isn't one out there. Nevertheless, it seems to be a slightly awkward methodology for merging changes from a branch into the mainline. Wouldn't it be more straightforward to display a listing of the files that have changed in the branch and let the user pick which ones to merge in? Am I misunderstanding how Vault works?

Thanks,
Dave

[ericsink]

Presenting a list of logical changes just seemed to make sense. You can still choose to exclude the changes to specific files.

However, the more important response to offer is: Yes, sometimes it is a bit difficult to figure out which changesets to choose. We're working on a major revision of this feature to make it more intuitive and more powerful.