Header tags causing conflicts when branching.

[ShadowSpawnOFCS]

We're using Vault 3.5.1 (4786) with the header tags option. We have development folder and a release branch off of there. We configured Vault to know SQL scripts and set the comment tag; all files have a header that includes:

Code: Select all

-- $Header$

The issue is that when I merge branches, I get conflicts on many files, but when I look at them, 99% are conflicts on the header information only. That is, file 1 has:

Code: Select all

-- $Header: /Development/{filepath and other header data}

and file 2 has:

Code: Select all

-- $Header: /Release/{filepath and other header data}

It shows them as a conflict, even though as soon as I commit either one, the whole line will be rewritten.

Is there any way to tell the diff engine that it can ignore the content of those header tags?

[lbauer]

There is currently no way to ignore header tags (keyword expansion) in merge branches. We do have a feature request logged for this, and I will add your "vote."