Problems merging on Get Latest Version

colin.desmond · Post by **colin.desmond** » Thu Nov 24, 2005 7:23 am

We have a pair of developers working in the same branch, and on occasion on the same files. They are working using the CVS style of commit.

They are now ready to commit some files into Vault. One of them has done so and when the second one comes to do a Get Latest Version which should merge developers 1 code into developers 2, it doesn't. We get no warnings in the messages box, the merge simply does nothing.

In vault the files are marked as Edited in developer 2's view, rather than needs merge.

How can we enaure that the merge takes place correctly?

Thanks

Colin

Post by **jclausius** » Fri Nov 25, 2005 8:41 am

The main safety is the Vault Server only allows you to commit a change against the latest. So there will be no "accidental" overwrites.

Getting back to your client, when User Two invokes commit, the Vault GUI does a check. The commit dialog will bring up a message that the file needs merged, and the commit cannot continue until the merge conflict is addressed.

If the user does not click commit, but refreshes, the Vault GUI will show the status on the file go to "Needs Merge". User Two can then address the merge at their leisure.