Keyword expansion causes merge conflict

[Thomas Linder Puls]

Our source files uses keyword expansion in a string literal:

Code: Select all

constants
    classVersion = "$JustDate: 2010-01-27 $$Revision: 25 $".

Very often when doing a get latest with "Attempt automatic merge" some of the files that get "Needs merge" status only have a conflict in that particular line.

So I have to waste time in investigating this non-conflict and resolving the merge state.

It would be very nice if the automatic merge could handle this.

[lbauer]

We have feature request 10032 logged for this functionality; I'll add your vote.

[Thomas Linder Puls]

Fine.