Feedback - expanding keywords and merges

[shaulbehr]

Hi,
I like the expanding keywords feature; it's pretty useful to be able to tell at a glance what version of code you're working with.
Only problem is, the expanding keywords really screw you when you're doing a merge between branches.
Because EVERY SINGLE file that has expanding keywords is reported as a merge conflict, and you have to open EVERY SINGLE ONE OF THEM, individually, to resolve the merge status, EVERY TIME you do a merge.
I've just given up on them and removed the expanding keywords from all of my code files.
Just thought you'd like that feedback; here's hoping you can fix the merge feature to auto-detect expanding keywords and not report them as merge conflicts.
Thanks,
Shaul

[lbauer]

We do have a workitem logged for this; it's number 10032 in our item tracking database. We are considering fixing this, but I'm not sure if it will make it into the release.