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

Branch Merging Issue

From: Michael Cole <mcole_at_forbin.com>
Date: Wed, 11 Aug 2010 08:29:08 -0500


I am new to branching and need a little guidance in my particular
situation. I made a Build1.1 branch from my trunk. From that Build 1.1
I created Build1.2 branch. I finished 1.1, merged the changes back
into 1.2, and then merged 1.1 back into my trunk and everything worked
well. However, now I am attempting to merge 1.2 back into my trunk and
I am getting a ton of tree conflicts. It almost seems like it's trying
to merge the same new items that 1.1 put back into the trunk. Do I need
to somehow tell 1.2 and I put 1.1 back into the trunk? Did I do
something incorrect with branching 1.2 off of 1.1?


Now that I read this question, it seems that I need to take 1.2 back
through 1.1 to get back to the trunk. Is this the case?




To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-11 15:32:34 CEST

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

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