Source consolidation question/recommendation

[tpickard]

First off, so far Vault has been a great solution for our small team (2 developers) but today we had an issue that was initially caused by user error but is something that I believe should be caught by vault, and there might be a way to do it thought I haven't seen an option.

In a nutshell, what happened was that the other developer worked on a project (VS2005) for a few days after not doing any coding for quite a while (he's a supervisor also) and submitted his changes to vault, etc. Well, I was either unaware or was aware and didn't pull down a latest version of code, regardless of that, I have been making changes/committing changes ever since then, without ever pulling down a new version. Last night I made the finishing touches, committed all my changes to vault and built my applications for deployment. Both applications share the same .dll, a form/class library. After about two hours the billing dept. contacted us stating that there were some weird things happening, so we started looking and come to find out, the piece of logic that was added a while back to that common .dll was not in the version that I updated with the system. I'm aware that yes, I should've pulled down a new version, that was an oversight by my part (first job/first time using source control) but I would think that if a user was committing changes to a file that had a newer version in the respository that it would either prompt the user to that fact or automatically merge/consolidate the sources so that they would be the same.

Is there anything I could've done in the Vault settings to have prevented this? Regardless, I will always be making sure that all versions are up to date manually before doing any changes.

Regards,

Taylor

[Beth]

When you check out an item to edit it, a baseline of the version you're working on is pulled to your computer. If Vault gets updated before you check in, then your baseline is out of date and there will be a Needs Merge status. You can't just check in a file with a Needs Merge status. You need to go through a manual merge with a resolve merge to place all the changes together in Vault, or you can just perform a resolve merge without performing the merge to allow your file to overwrite what is in the repository.

What version of Vault are you on?

Can you perform a history on the file and post it?

Open up Vault and see what the current status of the file is.

[Beth]

This issue is being worked on offline.

HS: 214609