Changes between Version 9 and Version 10 of SVN

Timestamp:

Dec 13, 2006, 10:29:36 AM (18 years ago)

Author:

Frederico Caldeira Knabben

Comment:

--

SVN

@@ -44 +44 @@
 A common task during a branch development, is to '''merge changes made in the trunk to the branch''', leaving it always up to date with the trunk. Remember that merges must be done from the last revision merged, starting from the revision from which the branch has been created.
 
-When '''merging branches to the trunk''', first merge the trunk to the branch and check that everything is ok. Make the necessary changes and commit the branch. Then switch to the trunk and merge the differences between the branch HEAD and the last trunk revision you have just merged to the branch (usually HEAD). 
+When '''merging branches to the trunk''', first merge the trunk to the branch and check that everything is ok. Make the necessary changes and commit the branch. Then switch to the trunk and merge the differences between the branch HEAD and the last trunk revision you have just merged to the branch (usually HEAD). Then, if the branch is not anymore needed, just delete it (SVN delete I mean).
 
 If you are insecure, don't be afraid of asking others to execute this task for you.