[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: Jamie Jackson <jamiejaxon_at_gmail.com>
Date: Mon, 30 Sep 2013 07:50:52 -0400

Maybe you don't know how to read conflict markers? Your last questions were
the reverse of what's going on.

Line 1
<<<<<<< .working
Line 2 previous version
=======
Line 2 incoming conflict in r2
>>>>>>> .merge-right.r2
Line 3

Line 1 and three are NOT in conflict. Line 2 is in conflict.
 jamiejackson hello:

As for 7777 and 8888: Their previous versions were identical in both r6 AND
r7, so there's no conflict.
------------------------------
why 3333 4444 no conflict?7777 8888 has conflicted?

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3065473

To unsubscribe from this discussion, e-mail: [
users-unsubscribe_at_subclipse.tigris.org].

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3065509

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2013-09-30 13:50:57 CEST

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