Merging branches: conflict on keyword expansions

ismangil · Post by **ismangil** » Wed Sep 21, 2005 3:50 am

In Vault 3.1.1:

When merging branches, I am always presented with a lot of conflicts, but in almost all cases the conflict is just the revision number as a result of the keyword expansion in the header comments.

Is there a quicker way to "accept changes" than going through it one by one?

dan · Post by **dan** » Wed Sep 21, 2005 8:44 am

Keywords are expanded by the time we do merging, so they will show up as conflicts.

I'll log a feature request to investigate this to see whether keywords can be handled specially for merging, but in the meantime, there isn't really a workaround - sorry.