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

RE: Branch Merging Issue

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Wed, 11 Aug 2010 11:41:56 -0400

> 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. 

Did you do a reintegrate of 1.1 into trunk or did you just do a tree merge?

> 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?

You shouldn't need to do that. Do the merge properties on trunk show that 1.1 is merged in up to HEAD (or the latest version that 1.1 has changes in it). Are you sure there is nothing more to merge from 1.1. into 1.2?

Are you perhaps not running the merge from 1.2 at the root of trunk where all the mergeinfo about 1.1 is located?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-11 17:42:17 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.