Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
> You can't merge any $...$ keywords in Linux CVS except $Log$, and only > then because of the way it works (because it preserves its existing > contents by default). Since $Log$ isn't that useful and merging the > other keywords is potentially much more useful, breaking that one case > is OK - it's personally saved me many hours of mucking around being > able to merge $Id$ for example. So that's why I stopped getting conflicts on $Id$ merges... THANK YOU!!!! I didn't realize it when the change came around, the conflicts just stopped. Regards, Glen Starrett