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

merging branches confusion

From: blackwater dev <blackwaterdev_at_gmail.com>
Date: 2006-08-15 19:37:41 CEST

Hello all,

Ok, I have svn with two branches. Different development can happen in each
branch and periodically needs to be merged together. I have read the pdf
book and looked up stuff online which has only confused me more. When
merging, I find that they changes to one branch are deleted. I simply need
a true merge where the working copies are blended together...is there anyway
to do this? If not, it seems like the idea of branching/merging is
pointless as I am finding when we merge truck b with truck a, we get the A
stuff in our local copy but changes that were never commited to truck a, are
now wiped out.

Received on Tue Aug 15 19:40:55 2006

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

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