[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: conflicts
|
From: |
Greg A. Woods |
|
Subject: |
RE: conflicts |
|
Date: |
Thu, 5 Jul 2001 13:32:00 -0400 (EDT) |
[ On Thursday, July 5, 2001 at 15:55:22 (+0100), Andy Baker wrote: ]
> Subject: RE: conflicts
>
> I don't understand why a conflict was returned on a keyword when you used
> -kk ?
That is pretty strange. Of course one of the files being merged in this
case (i.e. 'cvs update' not 'cvs checkout') is the file in the current
working directory. '-kk' won't delete the keyword values from that file.
I don't know where the other ones came from though.
> -----Original Message-----
> From: Venessa Williams [mailto:address@hidden
>
>
> /*
> <<<<<< a.java
> * $Header: a.java,v 1.11 2001/04/30 21:31:33 user1 Exp
> $
> =========
> * $Header: a.java,v 1.9.2.1 2001/06/15 16:45:05 user2
> Exp $
> >>>>>>>>1.9.2.1
> */
>
>
> cvs update -kk -j tag1 -j tag2 -Pd
--
Greg A. Woods
+1 416 218-0098 VE3TCP <address@hidden> <address@hidden>
Planix, Inc. <address@hidden>; Secrets of the Weird <address@hidden>