Peter Connolly napisał(a):
So go ahead and use -kkv. Even if you're using $Revision$ in your
code, do you really care if it's changed during merges???
On 2/12/07, Marx <[EMAIL PROTECTED]> wrote:
How to merge branches with -kkv? I need revisions, because they are used
in code as values, so I can't switch off this feature
Marx
If I merge with -kkv, there are conflicts like
>>>>>>>>
<<<<<<<<
and I must fix it manually
Marx
_______________________________________________
info-cvs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/info-cvs
