RE: Re: Re: please help me!
Jamie Jackson <[email protected]> Mon, 30 Sep 2013 07:50:52 -0400
| Newsgroups | gmane.comp.version-control.subversion.subclipse.user |
|---|---|
| Message-ID | <CA+onWPchOq3g46-FCT=S4R7dQr5Ucxq984YF8U3_yrfWeEOKjg@mail.gmail.com> |
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: [ [email protected]]. ------------------------------------------------------ http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3065509 To unsubscribe from this discussion, e-mail: [[email protected]].