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

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

From: Jamie Jackson <jamiejaxon_at_gmail.com>
Date: Sun, 29 Sep 2013 23:36:33 -0400

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 <ghyghost_at_sohu.com> 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: [
> users-unsubscribe_at_subclipse.tigris.org].
>

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2013-09-30 05:36:40 CEST

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