[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: nonmergeable file needs merge

From: David Everly
Subject: Re: nonmergeable file needs merge
Date: Thu, 29 Nov 2001 16:14:59 -0700
User-agent: Mutt/1.2.5i

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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]