[gmx-developers] cvs merge problems

[Roland Schulz]

Hi,

you want to use:
cvs up -kk

Roland

On Wed, Mar 18, 2009 at 8:44 AM, Alexander Herz <aherz.kazan at arcor.de> wrote:
> 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
> _______________________________________________
> gmx-developers mailing list
> gmx-developers at gromacs.org
> http://www.gromacs.org/mailman/listinfo/gmx-developers
> Please don't post (un)subscribe requests to the list. Use the
> www interface or send it to gmx-developers-request at gromacs.org.
>



-- 
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309