'Merge problem with workaround'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subclipse-users
Subject:    Merge problem with workaround
From:       Paul Glezen <pglezen () us ! ibm ! com>
Date:       2005-06-26 4:58:48
Message-ID: OFBF115085.CDEF1D3B-ON8825702C.001B5B57-8825702C.001B5B78 () us ! ibm ! com
[Download RAW message or body]

Thanks, Mark.

So it seems to have been user error.  In the branch scenario I presented,

             10--11--12    <-- b1 branch
            /
           /
----6--7--9------------14  <-- trunk


I should have regarded "11" as the first b1 change since "10" was merely a
copy from the trunk.

Paul
[Attachment #3 (text/html)]

<html><body>
<p><font face="Courier New">Thanks, Mark.</font><br>
<br>
<font face="Courier New">So it seems to have been user error.  In the branch scenario \
I presented,</font><br> <br>
<font face="Courier New">             10--11--12    &lt;-- b1 branch<br>
            /<br>
           /<br>
----6--7--9------------14  &lt;-- trunk</font><br>
<br>
<br>
<font face="Courier New">I should have regarded &quot;11&quot; as the first b1 change \
since &quot;10&quot; was merely a copy from the trunk.</font><br> <font face="Courier \
New"><br> </font><font face="Courier New">Paul</font></body></html>



[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic