[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 17:58:01 CET

> -----Original Message-----
> From: Steve.Nelson@uk.delarue.com [mailto:Steve.Nelson@uk.delarue.com]
> Sent: mercredi, 20. décembre 2006 17:00
> To: Chris.Fouts@qimonda.com; users@subversion.tigris.org
> Subject: Merging branch into trunk
[snip]
> Try to merge now:
>
> bash-3.1$ cd ../trunk/
> bash-3.1$ svn merge
> https://svntest/repos/devrep/dlr/trunk/dxbdpro.p@34
> https://svntest/repos/devrep/dlr/branches/SC1976/dxbdpro.p
> C dxbdpro.p
> bash-3.1$ svn merge https://svntest/repos/devrep/dlr/trunk/dxbdpro.p
> https://svntest/repos/devrep/dlr/branches/SC1976/dxbdpro.p
> C dxbdpro.p
> bash-3.1$ svn merge
> https://svntest/repos/devrep/dlr/trunk/dxbdpro.p@38
> https://svntest/repos/devrep/dlr/branches/SC1976/dxbdpro.p
> C dxbdpro.p
> bash-3.1$ svn commit
> svn: Commit failed (details follow):
> svn: Aborting commit: '/cygdrive/d/Subversion/trunk/dxbdpro.p' remains
> in conflict
>
> I thought I had resolved the conflict. Am confused now - what have I
> missed?

Could you provide us the part of your dxbdpro.p file where there is a conflict (the part with the <<< and >>>) ?

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 17:59:27 2006

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