Re: Re: Re: [Subclipse-users] please help me!

Subversion uses the diff3 algorithm but you should really be asking your
questions in the Subversion forum -- users_at_subversion.apache.org

Subclipse just provides UI to access Subversion. All the "work" happens
inside Subversion libraries. We have not control or influence over how it
decided to update the contents of your file or whether it produces a
conflict etc.

In my experience, from other threads on their list, contrived examples are
not good for judging how the algorithm works. It is better to test it with
real files with typical changes in it.

On Mon, Sep 30, 2013 at 8:42 AM, gaohongyan <ghyghost_at_sohu.com> wrote:

> jamiejackson :
>
> I understand how to read conflict markers。
>
> Why, I want to ask, "7777 8888" there is no conflict? but "22222 3333
> 4444" has conflicted?
>
> What is merging algorithm SVN use?
>
> ------------------------------------------------------
>
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3065512
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_subclipse.tigris.org].
>

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3065515
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].