[Top][All Lists]

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

nonmergeable file needs merge

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

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?


reply via email to

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