Hi! We merge our bugfixes branch every night into the main trunk just so that our bugfix branch does not travel too far from the main trunk. On the main trunk we do a cvs update -j BRANCH_NAME <module/file/dir> However far too many files get conflicts just because of the keywords. The Open Source Development with CVS book....suggests we "temporarily" disable keyword expansion with cvs update -kk -j BRANCH_NAME However by doing that we lose the keyword expansion for ever on the files (which we dont want) i.e. the keyword expansion disabling is permanent not temporary. How can I assure smooth merging, merging where we only really have code conflicts and not spurious keyword conflicts? If this question has been answered before or is documented somewhere, please point me to it. Thanks a million, aditya
