Re: nonmergeable file needs merge

[David Everly]

By the way, the reason I'm using -k 'b' is so that there is no
substitution....but these should be all mergeable text files.

On Thu, Nov 29, 2001 at 04:12:18PM -0700, David Everly wrote:
> 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.