From 7049d068a894b82ba809a7ce49daf411d7d2dce5 Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Fri, 28 Apr 2000 17:53:53 +0000 Subject: Note about conflict in merging --- etc/cvs-tips.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'etc/cvs-tips.txt') diff --git a/etc/cvs-tips.txt b/etc/cvs-tips.txt index a529b398..0678b1cd 100644 --- a/etc/cvs-tips.txt +++ b/etc/cvs-tips.txt @@ -27,5 +27,7 @@ Then perhaps merge in branch changes into main stream: cd projects/proofgen/ProofGeneral cvs update -jRelease-3-1-branch +NB: this merging will always create conficts with +$Id$ tags in source. (Is there a way to avoid this?) \ No newline at end of file -- cgit v1.2.3