merging

Hi,

I have read the redbean book section on merging and have a question.
Somewhere it said that the common practice is to branch for a
long-running change and constantly pull the changes on trunk into your
branch. The merging example then details merging the branch back into
the trunk without having pulled the changes from the trunk into the
branch. Say we have this set of revisions:

1 - initial creation
2 - commit to trunk
3 - branch to my-branch
4 - commit to trunk
5 - commit to trunk
6 - commit to my-branch
7 - merge 4:5 into my-branch
8 - commit to trunk
9 - commit to my-branch

How would you then merge the branch back into the trunk?

culley

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 10 00:05:55 2004