RE: Re: Re: please help me!
gaohongyan <[email protected]> Mon, 30 Sep 2013 05:42:02 -0700 (PDT)
| Newsgroups | gmane.comp.version-control.subversion.subclipse.user |
|---|---|
| Message-ID | <1347265780.935.1380544922523.JavaMail.httpd@localhost> |
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]].