[SOLVED] try brunches in svn?

Question

CVS

This is my first experience with brunches, I screwed up somewhere.
There is a trunk
Branch1 is branched from it
Branch2 is branched from branch1
It is necessary to collect everything in the trunk
What I did:
I tried branch1 => trunk - everything is ok
I tried to try branch2 => trunk - a bunch of tree conflict, I went the other way
I tried branch2 => branch1 - everything is ok
now I'm trying try branch1 => trunk - a bunch of tree conflict
What to do? where did i go wrong?

Answer 1

The solution came by experience:
I tried trunk => branch1 - everything went without errors,
and then vice versa branch1 => trunk - also without errors.
Those. such a sequence turned out:
1) branch1 => trunk
2) branch2 => branch1
3) trunk => branch1
4) branch1 => trunk
Probably this can be done better, if anyone has experience, please share.

Answer 2

The ideology is that when a branch is separated from the general trunk, it maintains general compatibility with it, and the trunk must be periodically merged into the branch, maintaining its relevance. When such a development of a new feature in parallel with the trunk in the next branch came to a stable version, this branch can be merged back into the trunk.

Answer 3

As far as I know, branches are created when you need to add some feature that is difficult to implement to the trunk. That is, a branch is being made, a feature is being tested, if everything is ok, we merge it with the trunk. If something went wrong, the branch is dead-end. You have a branch from a branch, and it is not clear why this was done. The main mistake seems to be in this step.