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 ?
Jim
ps my cvs header is a nice simple:
// $Date$ // $RCSfile$ // $Revision$ // $Author$ // $State$ // // $Log$ _______________________________________________ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
