MumboJumbo <[EMAIL PROTECTED]> 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 _______________________________________________ Info-cvs mailing list [email protected] http://lists.gnu.org/mailman/listinfo/info-cvs
