| <!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>Git: Merge Revision Dialog Box</title> |
| <link rel="stylesheet" href="ide.css" title="Oracle BLAFDoc" type="text/css"/> |
| </head> |
| |
| <body> |
| <p><a id="org.netbeans.modules.git.ui.merge.MergeRevision" name="org.netbeans.modules.git.ui.merge.MergeRevision"></a></p> |
| <div id="NBCSH1098"><!-- infolevel="all" infotype="General" --><a id="sthref112" name="sthref112"></a> |
| <h1>Git: Merge Revision Dialog Box</h1> |
| <a name="BEGIN" id="BEGIN"></a> |
| <p>The Merge Revision dialog box enables you to port changes from a specific repository revision to the copy of a file or folder in the Head. |
| <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer"> |
| <param name="content" value="http://www.oracle.com/pls/topic/lookup?ctx=nb8200&id=NBDAG261"> |
| <param name="text" value="<html><u>More</u></html>"> |
| <param name="textFontSize" value="medium"> |
| <param name="textColor" value="blue"> |
| </object> |
| </p> |
| <p>In the Merge Revision dialog box, you have to specify the required revision by entering a commit ID, existing branch, or tag name in the Revision field or click Select to view the list of revisions maintained in the repository. The following fields display information specific to the selected revision:</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-t30">Element</th> |
| <th align="left" valign="bottom" id="r1c2-t30">Description</th> |
| </tr> |
| </thead> |
| <tbody> |
| <tr align="left" valign="top"> |
| <td align="left" id="r2c1-t30" headers="r1c1-t30"> |
| <p>Commit ID</p> |
| </td> |
| <td align="left" headers="r2c1-t30 r1c2-t30">A unique identifier of the branched revision.</td> |
| </tr> |
| <tr align="left" valign="top"> |
| <td align="left" id="r3c1-t30" headers="r1c1-t30"> |
| <p>Author</p> |
| </td> |
| <td align="left" headers="r3c1-t30 r1c2-t30">Name of a person who committed the revision.</td> |
| </tr> |
| <tr align="left" valign="top"> |
| <td align="left" id="r4c1-t30" headers="r1c1-t30"> |
| <p>Message</p> |
| </td> |
| <td align="left" headers="r4c1-t30 r1c2-t30">A message specified during the commit of the revision.</td> |
| </tr> |
| </tbody> |
| </table> |
| <br /> |
| <!-- --> |
| <p>After you click <b>Merge</b> a three-way merge between the current branch, your Working Tree contents, and the specified branch is done.</p> |
| <p><b>Note</b>: After merging you must still commit the changes in order for them to be added to the HEAD.</p> |
| <a id="NBCSH1102" name="NBCSH1102"></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=NBDAG237"> |
| <param name="text" value="<html><u>"Versioning Applications with Git"</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> |
