[Top][All Lists]

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

Merge and CVS Headers ... best practice?

From: MumboJumbo
Subject: Merge and CVS Headers ... best practice?
Date: Mon, 03 Jan 2005 13:53:59 -0500
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.3) Gecko/20040910

Hi there,

I am merging a development branch for the first time (i.e. my companies first attempt at development feature branching) with the cvs HEAD branch ...

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 ?


ps my cvs header is a nice simple:

// $Date$
// $RCSfile$
// $Revision$
// $Author$
// $State$
// $Log$

reply via email to

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