Select Changes to be Merged

[rlandfair]

Hello,

I have a question regarding the 'Select Changes to be Merged' page in the Merge Branches wizard of the Vault client. I notice there are several versions I can choose from. What happens if I select all the versions (except the bottom one) and one file has changed several times between the versions? Do all of the changes to the one file get merged into the target branch? Should I only merge the version on the top of the list? If I have already merged the branches once, will it hurt anything if I select all the versions and merge again?

I really want to know what I should be doing and what is happening behind the scenes. I haven't been able to find a good explanation of what I should do on this page yet. If it is documented somewhere, can you point me to where that documentation is? I have checked the help file in the client but what I saw didn't really explain very much.

I have the standard version of Vault.

Thank You

[lbauer]

What happens if I select all the versions (except the bottom one) and one file has changed several times between the versions? Do all of the changes to the one file get merged into the target branch?

Yes. Vault merges Change Sets or transactions. So if you only selected some of the versions, only the changes in those versions would be merged. You're right that the Help needs to be more clear about this.

Here's a forum post with a behind-the-scenes description:
http://support.sourcegear.com/viewtopic ... ets#p62739

If I have already merged the branches once, will it hurt anything if I select all the versions and merge again?

No, the Merge Branches wizard won't detect changes so won't have anything to do.

In Vault 6.0, we are implementing Merge Markers, which are brackets that show what change sets you have already merged. Vault 6.0 is due out later this summer.