You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by David Newman <dn...@unixmonkeys.com> on 2012/06/28 15:32:07 UTC

Merge rules

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.

I am on subversion 1.7.5.

Thanks.

-Dave Newman

RE: Merge rules

Posted by Bob Archer <Bo...@amsi.com>.

> 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