[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Merging branch into trunk

From: Méresse Christophe <christophe.meresse_at_nagra.com>
Date: 2006-12-20 18:35:05 CET

> -----Original Message-----
> From: Steve.Nelson@uk.delarue.com [mailto:Steve.Nelson@uk.delarue.com]
> Sent: mercredi, 20. décembre 2006 18:04
> To: Méresse Christophe; Chris.Fouts@qimonda.com;
> users@subversion.tigris.org
> Subject: RE: Merging branch into trunk
>
> > -----Original Message-----
> > From: Méresse Christophe [mailto:christophe.meresse@nagra.com]
> > Could you provide us the part of your dxbdpro.p file where
> > there is a conflict (the part with the <<< and >>>) ?
>
> bash-3.1$ tail dxbdpro.p
> input stream temp_load close.
>
> return "".
> end.
> <<<<<<< .working
> /* Comment by nelson for SC1975 */
> /* Darryl's comment for sc1976 */
> =======
> /* Comment by nelson for SC1975 */
> >>>>>>> .merge-right.r39

OK, first of all, there seems to be a white space before nelson comment. Can you remove it in the trunk (or (maybe easier to understand) add it in the SC1976 branch and commit.
Then try to do your merge again.
If there is still a conflict, provide it to us again.

Regards
Christophe

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 20 18:36:09 2006

This is an archived mail posted to the Subversion Users mailing list.