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