[gmx-developers] cvs merge problems

[Alexander Herz]

Hi,

I'm having some trouble merging our modifications back into our trunk
(which is the current 4.0.4 release).
Due to the comments on top of each source file like:

<<<<<<< add_par.c
 * $Id: add_par.c,v 1.2 2009-03-18 11:14:24 ne42mar Exp $
=======
 * $Id: add_par.c,v 1.1.1.1.2.2 2009-03-18 11:24:10 ne42mar Exp $
>>>>>>> 1.1.1.1.2.2

It's a bit ridiculous having to remove this conflict for each source file.
So how can I avoid that?? How do you guys do it?

Thx,
Alex