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

Merge problem with workaround

From: Paul Glezen <pglezen_at_us.ibm.com>
Date: 2005-06-26 06:58:48 CEST

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.

Received on Sun Jun 26 14:58:48 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.