My cvswrappers has: * -k 'b'
Then I started getting cvs update: nonmergeable file needs merge. So I tried: * -k 'b' -m 'MERGE' However, the problem still happens...possibly because all the files were checked in on the earlier configuration. What is the setting I really want here, and how do I make sure everything in my repsitory now has it? Thanks, Dave. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
