Make Vault XML savvy

mscheuner · Post by **mscheuner** » Fri Dec 22, 2006 1:19 am

Folks,

We had a rather unpleasant experience when two developers simultaneously changed the same XML config file - Vault couldn't provide a proper merge....

Both developers tried to add a few <mytags>......</mytags> entries at the end of an XML file - but when Vault needed to merge this, it only offered to use either one developer's changes - or the other's - but it couldn't manage to merge the two.... it tried to merge it as if it where straight text, not taking into account that a "<mytag>content content content</mytag>" really represents an "atomic" entity which needs to be kept together.

Is there any chance Vault 4.0 will be a bit more savvy about merging XML?

Beth · Post by **Beth** » Fri Dec 22, 2006 9:22 am

You're right in thinking that Vault is not aware of programming conventions. If what was entered were in the exact same locations, then a decision has to be made. In a future release one will be able to modify the text during a merge which should help you with this issue. Would that cover what you need to happen?

For right now, you might want to return to one of the files and place that line not in the exact same location such as a line lower.

Beth · Post by **Beth** » Fri Dec 29, 2006 1:13 pm

As an update to this, a feature request was submitted at one time to support some programming conventions, and it looks like that is being worked on for a future release.