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

RE: Merge rules

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 28 Jun 2012 10:21:41 -0400

> I have a question regarding merging in subversion because I do not know
> what is happening under the covers.
>
> I'm wondering if branchA is created from trunk and branchB is created from
> branchA can changes be merged back to trunk from branchB directly or do
> they need get merged back to branchA first and then to trunk.  Or is this all
> just infeasible and all branches should be created from a single source and
> merged back and forth from that place.
>

Yes, you can merge from branchB back to trunk. Not a problem. Just make sure you don't get into a situation where you are doing cyclic merges.

BOb
Received on 2012-06-28 16:22:28 CEST

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.