changed:
-
<h2>SVN Merging</h2>

<p>The most common case for merging in SVN with the Jamoma project is merging changes from the active branch to the trunk.  The following is an example taken from a typical merge.</p>

<p>First you need to have the trunk checked out on the local machine.  Then you need to make sure it is up to date.  Finally, you should (if you are using the command line) cd to the directory where you will be merging sources.  In our example we will be merging updated graphics files.
</p>

<pre>cd Jamoma-trunk<br>svn update<br>cd Jamoma/library/graphics<br></pre>

<p>Now we are ready to actually call svn merge.  You run the merge by specifying the destination of the merge followed by the source of the merge as full repository URLs.</p>
<pre><br><p>svn merge https://jamoma.svn.sourceforge.net/svnroot/jamoma/trunk/Jamoma/library/graphics https://jamoma.svn.sourceforge.net/svnroot/jamoma/branches/active/Jamoma/library/graphics</p><br></pre>

<p>The above command will run, and it will update your local copy (the directory you are currently cd'd into).  You then can examine what it did, and verify that the result of the merge works.  Once doing this, then you can commit the merge using the normal mechanism.</p>
<pre>	svn commit -m "merging completed j4 skin from the active branch"<br></pre>

<p>All done!</p>