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

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

From: gaohongyan <ghyghost_at_sohu.com>
Date: Mon, 30 Sep 2013 05:42:02 -0700 (PDT)

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].
Received on 2013-09-30 14:42:06 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.