This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 99a0625  Automated site publishing by Jenkins build 393
99a0625 is described below

commit 99a06258346356270e8f4b1c57431df71150a027
Author: jenkins <bui...@apache.org>
AuthorDate: Sat Jan 19 11:48:38 2019 +0000

    Automated site publishing by Jenkins build 393
---
 content/kb/docs/ide/subversion.html | 299 ++++++++++++------------------------
 1 file changed, 99 insertions(+), 200 deletions(-)

diff --git a/content/kb/docs/ide/subversion.html 
b/content/kb/docs/ide/subversion.html
index 200a01a..257acfa 100644
--- a/content/kb/docs/ide/subversion.html
+++ b/content/kb/docs/ide/subversion.html
@@ -81,40 +81,19 @@
             <div id="toc" class="toc">
 <div id="toctitle"></div>
 <ul class="sectlevel1">
-<li><a href="#_setting_up_subversion">Setting up Subversion</a>
+<li><a href="#_using_subversion_support_in_netbeans_ide">Using Subversion 
Support in NetBeans IDE</a>
 <ul class="sectlevel2">
-<li><a href="#_getting_the_software">Getting the Software</a></li>
-<li><a href="#_specifying_the_path_to_the_subversion_executable">Specifying 
the Path to the Subversion Executable</a></li>
-<li><a href="#_ensuring_you_have_a_repository_to_connect_to">Ensuring you have 
a Repository to Connect to</a></li>
-</ul>
-</li>
-<li><a href="#_synchronizing_local_files_with_a_repository">Synchronizing 
Local Files with a Repository</a>
-<ul class="sectlevel2">
-<li><a href="#_opening_a_subversion_project_in_the_ide">Opening a Subversion 
Project in the IDE</a></li>
-<li><a href="#_checking_out_files_from_a_repository">Checking out Files from a 
Repository</a></li>
-<li><a href="#_importing_files_into_a_repository">Importing Files into a 
Repository</a></li>
-</ul>
-</li>
-<li><a href="#_editing_sources">Editing Sources</a>
-<ul class="sectlevel2">
-<li><a href="#_viewing_changes_in_the_source_editor">Viewing Changes in the 
Source Editor</a></li>
-<li><a href="#_viewing_file_status_information">Viewing File Status 
Information</a></li>
-<li><a href="#_comparing_file_revisions">Comparing File Revisions</a></li>
-<li><a href="#_merging_file_revisions">Merging File Revisions</a></li>
-</ul>
-</li>
-<li><a href="#_committing_sources_to_a_repository">Committing Sources to a 
Repository</a>
-<ul class="sectlevel2">
-<li><a href="#_updating_local_copies">Updating Local Copies</a></li>
-<li><a href="#_resolving_conflicts">Resolving Conflicts</a></li>
-<li><a href="#_performing_the_commit">Performing the Commit</a></li>
+<li><a href="#_setting_up_subversion">Setting up Subversion</a></li>
+<li><a href="#_synchronizing_local_files_with_a_repository">Synchronizing 
Local Files with a Repository</a></li>
+<li><a href="#_editing_sources">Editing Sources</a></li>
+<li><a href="#_committing_sources_to_a_repository">Committing Sources to a 
Repository</a></li>
+<li><a href="#_summary">Summary</a></li>
 </ul>
 </li>
-<li><a href="#_summary">Summary</a></li>
-<li><a href="#_see_also">See Also</a></li>
 </ul>
 </div>
-<div id="preamble">
+<div class="sect1">
+<h2 id="_using_subversion_support_in_netbeans_ide">Using Subversion Support in 
NetBeans IDE</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>NetBeans IDE provides tight integration with Subversion client versions 
1.6.x and higher. The IDE&#8217;s Subversion support is designed to help 
streamline the development process for groups working from a shared repository, 
enabling you to perform versioning tasks directly from your project system 
within the IDE.</p>
@@ -141,49 +120,8 @@
 </li>
 </ul>
 </div>
-<div class="imageblock">
-<div class="content">
-<img src="images/netbeans-stamp-80-74-73.png" alt="netbeans stamp 80 74 73">
-</div>
-<div class="title">Figure 1. Content on this page applies to the NetBeans IDE 
6.9 and higher</div>
-</div>
-<div class="paragraph">
-<p><strong>To complete this tutorial, you need the following software and 
resources.</strong></p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Software or Resource</th>
-<th class="tableblock halign-left valign-top">Version Required</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a 
href="https://netbeans.org/downloads/index.html";>NetBeans IDE</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">version 
6.9, 7.0, 7.1, 7.2, 7.3, 7.4, or 8.0</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a 
href="http://java.sun.com/javase/downloads/index.jsp";>Java Development Kit 
(JDK)</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">version 6, 
7, or 8</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a 
href="http://www.open.collab.net/downloads/netbeans/";>Subversion client 
software</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">1.6.x or 
more recent</p></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>*Note for Windows users: *You can install a bundled Subversion client as a 
NetBeans IDE plugin. Go to Tools &gt; Plugins, open the Available Plugins tab, 
and install the Bundled Subversion Client for Windows.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_setting_up_subversion">Setting up Subversion</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_setting_up_subversion">Setting up Subversion</h3>
 <div class="paragraph">
 <p>Before you can take advantage of the IDE&#8217;s Subversion support, you 
need to have Subversion client software installed on your computer. The 
IDE&#8217;s Subversion support works by interacting with the Subversion client 
to carry out versioning commands. Depending on your system, and whether you 
install the Subversion client to a non-default location, you may also need to 
register the path to the Subversion executable in the IDE. Finally, you need to 
make sure that you have a Subve [...]
 </div>
@@ -200,27 +138,8 @@
 </li>
 </ul>
 </div>
-<div class="sect2">
-<h3 id="_getting_the_software">Getting the Software</h3>
-<div class="paragraph">
-<p>Make sure you have the following software installed on your computer:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>NetBeans IDE (<a 
href="https://netbeans.org/downloads/index.html";>download</a>)</p>
-</li>
-<li>
-<p>Java SE Development Kit (<a 
href="http://www.oracle.com/technetwork/java/javase/downloads/index.html";>download</a>)</p>
-</li>
-<li>
-<p>Subversion client software (<a 
href="http://www.open.collab.net/downloads/netbeans/";>download</a>)</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_specifying_the_path_to_the_subversion_executable">Specifying the Path 
to the Subversion Executable</h3>
+<div class="sect3">
+<h4 id="_specifying_the_path_to_the_subversion_executable">Specifying the Path 
to the Subversion Executable</h4>
 <div class="paragraph">
 <p>NetBeans IDE automatically tries to identify the location of the Subversion 
executable file by using the <code>$PATH</code> system variable on your 
computer. Depending on your platform however, or whether you installed the 
Subversion client to a different location, it may be necessary to specify the 
path to the executable file explicitly.</p>
 </div>
@@ -264,8 +183,8 @@
 </ol>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_ensuring_you_have_a_repository_to_connect_to">Ensuring you have a 
Repository to Connect to</h3>
+<div class="sect3">
+<h4 id="_ensuring_you_have_a_repository_to_connect_to">Ensuring you have a 
Repository to Connect to</h4>
 <div class="paragraph">
 <p>Before invoking Subversion actions from the IDE, make sure you have access 
to a Subversion repository. The IDE <em>does not</em> provide support for 
creating Subversion repositories as this is not a frequently used action (In a 
production environment a repository is only created once, after the design of 
the repository layout has been determined.) and moreover it requires 
administrative commands.</p>
 </div>
@@ -288,10 +207,8 @@
 </div>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_synchronizing_local_files_with_a_repository">Synchronizing Local 
Files with a Repository</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_synchronizing_local_files_with_a_repository">Synchronizing Local 
Files with a Repository</h3>
 <div class="paragraph">
 <p>When using a version control system, you work by synchronizing local files 
with a repository, making changes to your local copy, then committing them to 
the repository. The following list describes various ways you can synchronize a 
project in NetBeans IDE, depending on your specific situation:</p>
 </div>
@@ -308,14 +225,14 @@
 </li>
 </ul>
 </div>
-<div class="sect2">
-<h3 id="_opening_a_subversion_project_in_the_ide">Opening a Subversion Project 
in the IDE</h3>
+<div class="sect3">
+<h4 id="_opening_a_subversion_project_in_the_ide">Opening a Subversion Project 
in the IDE</h4>
 <div class="paragraph">
 <p>If you already have a Subversion versioned project which you have been 
working with outside of the IDE, you can open it in the IDE and versioning 
features will automatically become available to you. The IDE scans your open 
projects and if they contain <code>.svn</code> directories, file status and 
context-sensitive support automatically becomes active for Subversion versioned 
projects.</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_checking_out_files_from_a_repository">Checking out Files from a 
Repository</h3>
+<div class="sect3">
+<h4 id="_checking_out_files_from_a_repository">Checking out Files from a 
Repository</h4>
 <div class="paragraph">
 <p>If you want to connect to a remote repository from the IDE, then check out 
files and immediately begin working with them, do the following:</p>
 </div>
@@ -379,8 +296,17 @@
 <div class="paragraph">
 <p>Depending on the protocol you are using, you may need to enter other 
information, such as username and password (e.g. for <code>http://</code>, 
<code>https://</code>, or <code>svn://</code>), or in the case of 
<code>svn+ssh://</code>, you must supply the command to establish the external 
tunnel.</p>
 </div>
-<div class="paragraph">
-<p>*Note: *If you are trying to implement certificated authentication with 
<code>https</code>, see: <a 
href="http://wiki.netbeans.org/wiki/view/FaqSslUserCert";>How to connect to a 
Subversion repository using user-certified authentication?</a></p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+If you are trying to implement certificated authentication with 
<code>https</code>, see: <a 
href="http://wiki.netbeans.org/wiki/view/FaqSslUserCert";>How to connect to a 
Subversion repository using user-certified authentication?</a>
+</td>
+</tr>
+</table>
 </div>
 <div class="paragraph">
 <p>For more help with <code>svn+ssh</code>, see: <a 
href="http://wiki.netbeans.org/wiki/view/FaqSubversionSSH";>How do I set up SSH 
with Subversion?</a>
@@ -406,12 +332,21 @@
 </li>
 </ol>
 </div>
-<div class="paragraph">
-<p>*Note: *If the checked out sources contain NetBeans projects, a dialog 
appears prompting you to open them in the IDE. If the sources do not contain a 
project, the dialog appears prompting you to create a new project from the 
sources and then open them in the IDE. If you create a new project for such 
sources, select the appropriate project category (i.e. in the New Project 
wizard) and then use the With Existing Sources option within that category.</p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+*If the checked out sources contain NetBeans projects, a dialog appears 
prompting you to open them in the IDE. If the sources do not contain a project, 
the dialog appears prompting you to create a new project from the sources and 
then open them in the IDE. If you create a new project for such sources, select 
the appropriate project category (i.e. in the New Project wizard) and then use 
the With Existing Sources option within that category.
+</td>
+</tr>
+</table>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_importing_files_into_a_repository">Importing Files into a 
Repository</h3>
+<div class="sect3">
+<h4 id="_importing_files_into_a_repository">Importing Files into a 
Repository</h4>
 <div class="paragraph">
 <p>Alternately, you can import a project you have been working on in the IDE 
to a remote repository, then continue to work on it in the IDE after it has 
become synchronized.</p>
 </div>
@@ -457,10 +392,8 @@
 </div>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_editing_sources">Editing Sources</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_editing_sources">Editing Sources</h3>
 <div class="paragraph">
 <p>Once you have a Subversion versioned project opened in the IDE, you can 
begin making changes to sources. As with any project opened in NetBeans IDE, 
you can open files in the Source Editor by double-clicking on their nodes, as 
they appear in the IDE&#8217;s windows (for example, Projects (Ctrl-1 on 
Windows/Cmd-1 on OS X), Files (Ctrl-2 on Windows/Cmd-2 on OS X), Favorites 
(Ctrl-3 on Windows/Cmd-3 on OS X)).</p>
 </div>
@@ -483,8 +416,8 @@
 </li>
 </ul>
 </div>
-<div class="sect2">
-<h3 id="_viewing_changes_in_the_source_editor">Viewing Changes in the Source 
Editor</h3>
+<div class="sect3">
+<h4 id="_viewing_changes_in_the_source_editor">Viewing Changes in the Source 
Editor</h4>
 <div class="paragraph">
 <p>When you open a versioned file in the IDE&#8217;s Source Editor, you can 
view real-time changes occurring to your file as you modify it against your 
previously checked-out base version from the repository. As you work, the IDE 
uses color encoding in the Source Editor&#8217;s margins to convey the 
following information:</p>
 </div>
@@ -537,8 +470,8 @@
 </tbody>
 </table>
 </div>
-<div class="sect2">
-<h3 id="_viewing_file_status_information">Viewing File Status Information</h3>
+<div class="sect3">
+<h4 id="_viewing_file_status_information">Viewing File Status Information</h4>
 <div class="paragraph">
 <p>When you are working in the Projects (Ctrl-1 on Windows/Cmd-1 on OS X), 
Files (Ctrl-2 on Windows/Cmd-2 on OS X), Favorites (Ctrl-3 on Windows/Cmd-3 on 
OS X), or Versioning windows, the IDE provides several visual features that aid 
in viewing status information about your files. In the example below, notice 
how the badge (e.g. image::images/blue-badge.png[]), color of the file name, 
and adjacent status label, all coincide with each other to provide you with a 
simple but effective way t [...]
 </div>
@@ -563,8 +496,8 @@
 </li>
 </ul>
 </div>
-<div class="sect3">
-<h4 id="_badges_and_color_coding">Badges and Color Coding</h4>
+<div class="sect4">
+<h5 id="_badges_and_color_coding">Badges and Color Coding</h5>
 <div class="paragraph">
 <p>Badges are applied to project, folder, and package nodes and inform you of 
the status of files contained within that node:</p>
 </div>
@@ -638,8 +571,8 @@
 </tbody>
 </table>
 </div>
-<div class="sect3">
-<h4 id="_file_status_labels">File Status Labels</h4>
+<div class="sect4">
+<h5 id="_file_status_labels">File Status Labels</h5>
 <div class="paragraph">
 <p>File status labels provide a textual indication of the status of versioned 
files in the IDE&#8217;s windows. By default, the IDE displays status (new, 
modified, ignored, etc.) and folder information in gray text to the right of 
files, as they are listed in windows. You can, however, modify this format to 
suit your own needs. For example, if you want to add revision numbers to status 
labels, do the following:</p>
 </div>
@@ -679,8 +612,8 @@
 <p>File status labels can be toggled on and off by choosing View &gt; Show 
Versioning Labels from the main menu.</p>
 </div>
 </div>
-<div class="sect3">
-<h4 id="_the_versioning_window">The Versioning Window</h4>
+<div class="sect4">
+<h5 id="_the_versioning_window">The Versioning Window</h5>
 <div class="paragraph">
 <p>The Subversion Versioning window provides you with a real-time list of all 
of the changes made to files within a selected folder of your local working 
copy. It opens by default in the bottom panel of the IDE, listing added, 
deleted or modified files.</p>
 </div>
@@ -699,18 +632,29 @@
 <div class="paragraph">
 <p>By default, the Versioning window displays a list of all modified files 
within the selected package or folder. Using the buttons in the toolbar, you 
can choose to display all changes or limit the list of displayed files to 
either locally or remotely modified files. You can also click the column 
headings above the listed files to sort the files by name, status or 
location.</p>
 </div>
-<div class="paragraph">
-<p><strong>Notes:</strong></p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+To get notified of when a source file in one of your open projects has been 
modified, choose Team &gt; Show Changes from the main menu. Alternatively, if 
the Versioning window is open, click the Refresh Status button.
+</td>
+</tr>
+</table>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>To get notified of when a source file in one of your open projects has been 
modified, choose Team &gt; Show Changes from the main menu. Alternatively, if 
the Versioning window is open, click the Refresh Status button.</p>
-</li>
-<li>
-<p>Operations in the Projects window work only on the projects themselves and 
are not recursive. To show modifications in nested/child projects, you can use 
the Files or Favorites window.</p>
-</li>
-</ul>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+Operations in the Projects window work only on the projects themselves and are 
not recursive. To show modifications in nested/child projects, you can use the 
Files or Favorites window.
+</td>
+</tr>
+</table>
 </div>
 <div class="paragraph">
 <p>The Versioning window toolbar also includes buttons that enable you to 
invoke the most common Subversion tasks on all files displayed in the list. The 
following table lists the Subversion commands available in the toolbar of the 
Versioning window:</p>
@@ -807,8 +751,8 @@
 </table>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_comparing_file_revisions">Comparing File Revisions</h3>
+<div class="sect3">
+<h4 id="_comparing_file_revisions">Comparing File Revisions</h4>
 <div class="paragraph">
 <p>Comparing file revisions is a common task when working with versioned 
projects. The IDE enables you to compare revisions by using the Diff command, 
which is available from the right-click menu of a selected item (Subversion 
&gt; Diff), as well as from the Versioning window. In the Versioning window, 
you can perform diffs by either double-clicking a listed file, otherwise you 
can click the Diff All icon (image::images/diff.png[]) located in the toolbar 
at the top.</p>
 </div>
@@ -846,8 +790,8 @@
 </li>
 </ul>
 </div>
-<div class="sect3">
-<h4 id="_make_changes_to_your_local_working_copy">Make Changes to your Local 
Working Copy</h4>
+<div class="sect4">
+<h5 id="_make_changes_to_your_local_working_copy">Make Changes to your Local 
Working Copy</h5>
 <div class="paragraph">
 <p>If you are performing a diff on your local working copy, the IDE enables 
you to make changes directly from within the Diff Viewer. To do so, you can 
either place your cursor within the right pane of the Diff Viewer and modify 
your file accordingly, otherwise make use of the inline icons that display 
adjacent to each highlighted change:</p>
 </div>
@@ -874,8 +818,8 @@
 </tbody>
 </table>
 </div>
-<div class="sect3">
-<h4 id="_navigate_among_differences_between_compared_files">Navigate among 
Differences between Compared Files</h4>
+<div class="sect4">
+<h5 id="_navigate_among_differences_between_compared_files">Navigate among 
Differences between Compared Files</h5>
 <div class="paragraph">
 <p>If your diff contains multiple differences, you can navigate among them by 
using the arrow icons displayed in the toolbar. The arrow icons enable you to 
view differences as they appear from top to bottom:</p>
 </div>
@@ -898,8 +842,8 @@
 </tbody>
 </table>
 </div>
-<div class="sect3">
-<h4 id="_change_viewing_criteria">Change Viewing Criteria</h4>
+<div class="sect4">
+<h5 id="_change_viewing_criteria">Change Viewing Criteria</h5>
 <div class="paragraph">
 <p>You can choose whether to view files containing changes from the local 
working copy, the repository, as well as both simultaneously:</p>
 </div>
@@ -939,8 +883,8 @@ The color scheme described in the <a href="#badges">Badges 
and Color Coding</a>
 </div>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_merging_file_revisions">Merging File Revisions</h3>
+<div class="sect3">
+<h4 id="_merging_file_revisions">Merging File Revisions</h4>
 <div class="paragraph">
 <p>NetBeans IDE enables you to merge changes between repository revisions and 
your local working copy. You can specify a range of revisions to merge. You can 
even merge a range of revisions from two separate repository folders.</p>
 </div>
@@ -984,10 +928,8 @@ The color scheme described in the <a href="#badges">Badges 
and Color Coding</a>
 </div>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_committing_sources_to_a_repository">Committing Sources to a 
Repository</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_committing_sources_to_a_repository">Committing Sources to a 
Repository</h3>
 <div class="paragraph">
 <p>After making changes to sources, you commit them to the repository. It is 
generally a good idea to update any copies you have against the repository 
prior to performing a commit in order to ensure that conflicts do not arise. 
Conflicts can occur however, and should be thought of as a natural event when 
numerous developers are working on a project simultaneously. The IDE provides 
flexible support that enables you to perform all of these functions. It also 
provides a Conflict Resolver w [...]
 </div>
@@ -1004,8 +946,8 @@ The color scheme described in the <a href="#badges">Badges 
and Color Coding</a>
 </li>
 </ul>
 </div>
-<div class="sect2">
-<h3 id="_updating_local_copies">Updating Local Copies</h3>
+<div class="sect3">
+<h4 id="_updating_local_copies">Updating Local Copies</h4>
 <div class="paragraph">
 <p>You can perform updates by choosing Subversion &gt; Update from the 
right-click menu of any versioned item in the Projects, Files, or Favorites 
windows. When working directly from the Versioning window, you need only 
right-click a listed file and choose Update.</p>
 </div>
@@ -1013,8 +955,8 @@ The color scheme described in the <a href="#badges">Badges 
and Color Coding</a>
 <p>To perform an update on all source files, you can click the Update All icon 
(image::images/update.png[]), which displays in the toolbars located at the top 
of both the <a href="#versioning">Versioning Window</a>, as well as the <a 
href="#comparing">Diff Viewer</a>. Any changes that may have occurred in the 
repository are displayed in the Versioning Output window.</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_resolving_conflicts">Resolving Conflicts</h3>
+<div class="sect3">
+<h4 id="_resolving_conflicts">Resolving Conflicts</h4>
 <div class="paragraph">
 <p>When you perform an update or a commit, the IDE&#8217;s Subversion support 
compares your files with repository sources to make sure that other changes 
have not already occurred in the same locations. When your previous checkout 
(or update) no longer matches the repository <em>HEAD</em> (i.e. most current 
revision), <em>and</em> the changes that you applied to your local working copy 
coincide with areas in the HEAD that have also changed, your update or commit 
results in a <em>conflict [...]
 </div>
@@ -1045,8 +987,8 @@ The color scheme described in the <a href="#badges">Badges 
and Color Coding</a>
 <p>You resolve a conflict by accepting one of the two revisions displayed in 
the top pane. Click the Accept button of the revision you want to accept. The 
IDE merges the accepted revision with the source file, and you can immediately 
see the results of the merge in the bottom pane of the Merge Conflicts 
Resolver. Once all conflicts are resolved, click OK to exit the Merge Conflicts 
Resolver and save the modified file. The conflict badge is removed and you can 
now commit the modified file [...]
 </div>
 </div>
-<div class="sect2">
-<h3 id="_performing_the_commit">Performing the Commit</h3>
+<div class="sect3">
+<h4 id="_performing_the_commit">Performing the Commit</h4>
 <div class="paragraph">
 <p>After editing source files, performing an update and resolving any 
conflicts, you commit files from your local working copy to the repository. The 
IDE enables you to call the commit command in the following ways:</p>
 </div>
@@ -1112,57 +1054,14 @@ The color scheme described in the <a 
href="#badges">Badges and Color Coding</a>
 </div>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_summary">Summary</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_summary">Summary</h3>
 <div class="paragraph">
 <p>This concludes the guided tour of Subversion for NetBeans IDE 6.x and 
higher. This document demonstrated how to perform basic versioning tasks in the 
IDE by guiding you through the standard workflow when using the IDE&#8217;s 
Subversion support. It has shown how to set up a versioned project and perform 
basic tasks on versioned files while introducing you to some of the new 
Subversion features included in the IDE.</p>
 </div>
 <div class="paragraph">
-<p><a 
href="/about/contact_form.html?to=3&amp;subject=Feedback:%20Using%20Subversion%20Support%20in%20NetBeans%20IDE">Send
 Feedback on This Tutorial</a></p>
-</div>
-<div class="paragraph">
-<p><a href="#top">top</a></p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_see_also">See Also</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>For related documents, see the following resources:</p>
+<p>&lt;top,top&gt;&gt;</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p><a 
href="http://wiki.netbeans.org/wiki/view/NetBeansUserFAQ#section-NetBeansUserFAQ-VersionControlSystems";>Subversion
 Support FAQ for NetBeans IDE</a></p>
-</li>
-<li>
-<p><a href="http://wiki.netbeans.org/FaqSubversionClients";>Subversion Clients 
FAQ</a></p>
-</li>
-<li>
-<p><a href="git.html">Using Git Support in NetBeans IDE</a></p>
-</li>
-<li>
-<p><a href="mercurial.html">Using Mercurial Support in NetBeans IDE</a></p>
-</li>
-<li>
-<p><a href="mercurial-queues.html">Using Support for Mercurial Queues in 
NetBeans IDE</a></p>
-</li>
-<li>
-<p><a href="cvs.html">Using CVS Support in NetBeans IDE</a></p>
-</li>
-<li>
-<p><a href="clearcase.html">Using ClearCase Support in NetBeans IDE</a></p>
-</li>
-<li>
-<p><a 
href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&amp;id=NBDAG234";>Versioning
 Applications with Version Control</a> in <em>Developing Applications with 
NetBeans IDE</em>.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p><a href="#top">top</a></p>
 </div>
 </div>
 </div>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to