I'm merging a bug-fix branch back into the main (development) branch. The merging works fine, expect I use $Id$ type of keyword tags in the documents and so it's those that cause the merge conflicts. So I have to go in and clean up just a bunch of $Id$ conflicts which is a waste of time. Isn't there a way to tell CVS to make the merge, but ignore any conflicts with $Id$ type of tag differences? -- Bill Moseley moseley@hank.org