Re: Re: please help me!
Jamie Jackson <[email protected]> Sun, 29 Sep 2013 23:36:33 -0400
| Newsgroups | gmane.comp.version-control.subversion.subclipse.user |
|---|---|
| Message-ID | <CA+onWPecoYZz9=fyLs5Ut_XJP16XstZ-PSL-ZnEbhkmjU8pybA@mail.gmail.com> |
Sorry, I still don't completely understand the ancestry here, and the table is really hard to read. Are all columns but the left on the same branch? If so, I think that since you're skipping (only) r6, and since r8 wants to change those conflicting lines *from* something that doesn't exist in r5, that accounts for the diffs. As for 7777 and 8888: Their previous versions were identical in both r6 AND r7, so there's no conflict. On Sun, Sep 29, 2013 at 9:27 PM, gaohongyan <[email protected]> wrote: > Why don't conflict ", 7777, 8888 "? > > ------------------------------------------------------ > > http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3065467 > > To unsubscribe from this discussion, e-mail: [ > [email protected]]. > ------------------------------------------------------ http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3065472 To unsubscribe from this discussion, e-mail: [[email protected]].