[Top][All Lists]

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

Re: nonmergeable file needs merge

From: Larry Jones
Subject: Re: nonmergeable file needs merge
Date: Thu, 29 Nov 2001 22:06:39 -0500 (EST)

David Everly writes:
> So I tried:
> * -k 'b' -m 'MERGE'
> However, the problem still happens...possibly because all the files
> were checked in on the earlier configuration.

Binary mode forces nomerge.  As you already discovered, the correct way
to do this is to use -ko.

-Larry Jones

Isn't it sad how some people's grip on their lives is so precarious
that they'll embrace any preposterous delusion rather than face an
occasional bleak truth? -- Calvin

reply via email to

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