[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Problem with merge and keywords.
From: |
JBB |
Subject: |
Problem with merge and keywords. |
Date: |
Tue, 04 Oct 2005 15:50:46 +0200 |
User-agent: |
Thunderbird 1.4 (Windows/20050908) |
Using: cvsNT and Tortoise cvs
My files have an header like this :
// $Revision: 1.13 $
which is automatically updated by cvs.
I've a merge confict each time the file is edited by two different persons.
The file to merge look like this:
<<<<<<< myfile.cpp
// $Revision: 1.13 $
=======
// $Revision$
>>>>>>> 1.14
It seems that when getting source from repository the Revision value is
removed, and then causes the confict.
Where does the problem come from? svcNT or Tortoise ?
What can I do ?
Thanks
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Problem with merge and keywords.,
JBB <=