Merging with SVN
Practical Howto (for the most simple case):
http://www.gra2.com/article.php/merge-branch-trunk-in-subversion
Some background:
http://wiki.pentaho.com/pages/viewpage.action?pageId=13173361
Trackback URL for this post:
http://ich.war-es-wirklich.net/trackback/265