Re: Re: Re: please help me!
Mark Phippard <[email protected]> Mon, 30 Sep 2013 09:46:47 -0400
| Newsgroups | gmane.comp.version-control.subversion.subclipse.user |
|---|---|
| Message-ID | <CAHFaGCqDeNrRz2cxa1r0_L5hzbWw5Ww9E0kW=yyBsVHMyi_RyA@mail.gmail.com> |
Subversion uses the diff3 algorithm but you should really be asking your questions in the Subversion forum -- [email protected] 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 <[email protected]> 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: [ > [email protected]]. > -- 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: [[email protected]].