[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merge and CVS Headers ... best practice?
|
From: |
Pierre Asselin |
|
Subject: |
Re: Merge and CVS Headers ... best practice? |
|
Date: |
Tue, 4 Jan 2005 01:06:03 +0000 (UTC) |
|
User-agent: |
tin/1.6.1-20030810 ("Mingulay") (UNIX) (NetBSD/2.0 (i386)) |
MumboJumbo <address@hidden> wrote:
> I keep getting merge conflicts in CVS headers ... its not a big deal ...
> but it is very annoying ... is it common practice to use CVS headers
> branching together ?
I use "update -kk -j<start> -j<finish>" when I do my merges, where
the "-kk" option prevents any keyword expansion conflicts. After
I commit the merged sandbox, I get rid of the sticky "-kk" with
an "update -A".
> ps my cvs header is a nice simple:
> [ ... ]
> // $Log$
Except that one. Don't use $Log$, it's a conflict generator.
--
pa at panix dot com