https://wiki.networksecuritytoolkit.org/nstwiki/index.php?action=history&feed=atom&title=Merge_Changes_Back_To_Development_Area 2026-04-08T20:20:03Z Revision history for this page on the wiki MediaWiki 1.41.5 https://wiki.networksecuritytoolkit.org/nstwiki/index.php?title=Merge_Changes_Back_To_Development_Area&diff=7569&oldid=prev 2014-02-20T22:44:14Z

<p></p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="en"> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 18:44, 20 February 2014</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>At this point, all of the source code changes related to the release should have been committed to the ''<del style="font-weight: bold; text-decoration: none;">trunk</del>''. In order to continue development, you will want to merge these changes back into the ''dev'' area using the instructions found on the [[Subversion Notes]] page.</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>At this point, all of the source code changes related to the release should have been committed to the ''<ins style="font-weight: bold; text-decoration: none;">repo</ins>'' <ins style="font-weight: bold; text-decoration: none;">area</ins>. In order to continue development, you will want to merge these changes back into <ins style="font-weight: bold; text-decoration: none;">the appropriate directory under </ins>the ''dev'' area using the instructions found on the [[Subversion Notes]] page.</div></td></tr> </table>

Paul Blankenbaker https://wiki.networksecuritytoolkit.org/nstwiki/index.php?title=Merge_Changes_Back_To_Development_Area&diff=6202&oldid=prev 2012-09-03T16:09:41Z

<p>Created page with &quot;At this point, all of the source code changes related to the release should have been committed to the &#039;&#039;trunk&#039;&#039;. In order to continue development, you will want to merge these c...&quot;</p> <p><b>New page</b></p><div>At this point, all of the source code changes related to the release should have been committed to the &#039;&#039;trunk&#039;&#039;. In order to continue development, you will want to merge these changes back into the &#039;&#039;dev&#039;&#039; area using the instructions found on the [[Subversion Notes]] page.</div>

Paul Blankenbaker