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

Re: Problems with svn merge on merging a whole branch to another

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-06-12 00:40:21 CEST

On 11.06.2005, at 15:00, Thomas Mauch wrote:

> [snip] I'm encountering a lot of conflicts where I think the merge
> should be able to process the files silently and correctly without
> user intervention.
>
> [snip]
>
> <<<<<<< .working
> // some lines
> // of code
> // are her
> =======
>>>>>>>> .merge-right.r542

My company has been using Subversion for four months, and so far i've
had to deal with very few conflicts, but I've seen this on occasion too
and am also curious why this happens, so would appreciate any insight.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jun 12 00:42:08 2005

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