| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
| "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| <!-- |
| |
| Licensed to the Apache Software Foundation (ASF) under one |
| or more contributor license agreements. See the NOTICE file |
| distributed with this work for additional information |
| regarding copyright ownership. The ASF licenses this file |
| to you under the Apache License, Version 2.0 (the |
| "License"); you may not use this file except in compliance |
| with the License. You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, |
| software distributed under the License is distributed on an |
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| KIND, either express or implied. See the License for the |
| specific language governing permissions and limitations |
| under the License. |
| |
| --> |
| <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> |
| <head> |
| <title>CVS: Merge Conflicts Resolver</title> |
| <link rel="stylesheet" href="ide.css" title="Oracle BLAFDoc" type="text/css"/> |
| </head> |
| |
| <body> |
| <p><a id="org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent" name="org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent"></a></p> |
| <div id="NBCSH1713"><!-- infolevel="all" infotype="General" --><a id="sthref211" name="sthref211"></a> |
| <h1>CVS: Merge Conflicts Resolver</h1> |
| <a name="BEGIN" id="BEGIN"></a> |
| <p>The Merge Conflicts Resolver enables you to resolve conflicts between local copies of version-controlled files and the repository before committing them. |
| <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer"> |
| <param name="content" value="http://www.oracle.com/pls/topic/lookup?ctx=nb8200&id=NBDAG2379"> |
| <param name="text" value="<html><u>How?</u></html>"> |
| <param name="textFontSize" value="medium"> |
| <param name="textColor" value="blue"> |
| </object> |
| </p> |
| <p>The Merge Conflicts Resolver displays the two conflicting revisions side by side in the top pane, with the conflicting areas highlighted. You resolve a conflict by accepting one of the revisions being displayed.</p> |
| |
| <table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0"> |
| <col width="24%" /> |
| <col width="*" /> |
| <thead> |
| <tr align="left" valign="top"> |
| <th align="left" valign="bottom" id="r1c1-t23">Element</th> |
| <th align="left" valign="bottom" id="r1c2-t23">Description</th> |
| </tr> |
| </thead> |
| <tbody> |
| <tr align="left" valign="top"> |
| <td align="left" id="r2c1-t23" headers="r1c1-t23"> |
| <p>Next Difference</p> |
| </td> |
| <td align="left" headers="r2c1-t23 r1c2-t23">Move forward in the file to the next difference that the Merge Conflicts Resolver has identified.</td> |
| </tr> |
| <tr align="left" valign="top"> |
| <td align="left" id="r3c1-t23" headers="r1c1-t23">Previous Difference</td> |
| <td align="left" headers="r3c1-t23 r1c2-t23">Move backward in the file to the previous difference that the Merge Conflicts Resolver has identified.</td> |
| </tr> |
| <tr align="left" valign="top"> |
| <td align="left" id="r4c1-t23" headers="r1c1-t23"> |
| <p>Accept</p> |
| </td> |
| <td align="left" headers="r4c1-t23 r1c2-t23">Each version of the file shown in the Merge Conflicts Resolver has an Accept button over the file. If one of the versions contains the content you wish to retain, click Accept. Otherwise, exit the Merge Conflicts Resolver and edit the file manually.</td> |
| </tr> |
| </tbody> |
| </table> |
| <br /> |
| <!-- --> |
| <p>Click the Accept button of the revision you want to accept. The IDE merges the accepted revision with the source file. You can see the results of the merge in the bottom pane of the Merge Conflicts Resolver.</p> |
| <p>Once all conflicts are resolved, click OK to exit the Merge Conflicts Resolver and save the modified file. The Merge Conflict badge is removed from the file and you can now commit the modified file to the repository.</p> |
| <a id="NBCSH1716" name="NBCSH1716"></a> |
| <hr><p><b>Related Topics</b></p> |
| <p><i>Developing Applications with NetBeans IDE</i>, |
| <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer"> |
| <param name="content" value="http://www.oracle.com/pls/topic/lookup?ctx=nb8200&id=NBDAG236"> |
| <param name="text" value="<html><u>"Versioning Applications with CVS"</u></html>"> |
| <param name="textFontSize" value="medium"> |
| <param name="textColor" value="blue"> |
| </object> |
| </p> |
| |
| <!-- --> |
| <!-- Start Footer --> |
| |
| |
| <table summary="" cellspacing="0" cellpadding="0" width="100%"> |
| <tr> |
| <td align="left" width="86%"><a href="legal_notice.htm"> |
| Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> |
| </td> |
| </tr> |
| </table> |
| <!-- --> |
| </body> |
| </html> |
