| <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><HTML> |
| <HEAD> |
| <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> |
| <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> |
| |
| <LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> |
| <title>Working with the comparison</title> |
| |
| </HEAD> |
| <BODY BGCOLOR="#ffffff"> |
| <h3> |
| Working with the comparison</h3> |
| <p CLASS="Head">Comparing file1.txt and file2.txt resulted in the following |
| compare editor. In this section we will learn how to use the compare editor to |
| resolve the differences between the two files.</p> |
| <p> |
| <img src="../images/Image80_compare_editor.gif" alt="Compare editor" border="0" width="631" height="236"></p> |
| <p>There are two |
| parts to the compare editor's local toolbar. The right group of local toolbar buttons |
| (#1) allows you to move to the next or previous change. </p> |
| <blockquote> |
| <p> |
| <img src="../images/Image80_compare_editor3.gif" alt="Compare buttons" border="0" width="162" height="51"></p> |
| </blockquote> |
| <ol> |
| <li>Click the Select Next Change button |
| <img src="../images/Image80_compare_editor_next.gif" alt="Compare editor next button" border="0" width="23" height="23">. |
| Observe how it selects the next difference.</li> |
| <li> |
| <p CLASS="Para">Click Select Next |
| Change button a second time to go to the next change. </p> |
| </li> |
| <li> |
| <p CLASS="Para">Click the Select Previous Change |
| button.</p> |
| </li> |
| </ol> |
| <p>The left group of local toolbar buttons (see #2) allows you to merge changes from the left file to the |
| right file and vice versa. There are four types of merges you can perform:</p> |
| <ul> |
| <li>Copy whole document from left to right. </li> |
| <li>Copy whole document from right to left.</li> |
| <li>Copy current change from left to right.</li> |
| <li>Copy current change from right to left.</li> |
| </ul> |
| <p> |
| Typically the copy whole document actions are used when you know the entire file |
| on either the left or right can just be replaced by the contents of the other |
| file.</p> |
| <p> |
| The Copy current change buttons allow you to merge a single change. </p> |
| <ol> |
| <li> |
| <p CLASS="Para">Ensure that the second difference is selected (as shown |
| below):</p> |
| <p CLASS="Para"> |
| <img src="../images/Image80_compare_change2.gif" alt="Compare editor" border="0" width="533" height="236"></p> |
| </li> |
| <li> |
| <p CLASS="Para">Click Copy |
| current change from right to |
| left |
| <img src="../images/Image80_compare_rl.gif" alt="Compare editor right to left button" border="0" width="29" height="22"> |
| button. Observe |
| that the selected text from the right file is copied to the left file. |
| <p CLASS="Para"><img src="../images/Image80_compare_after.gif" alt="Compare editor" border="0" width="544" height="235"></p> |
| </li> |
| <li> |
| <p CLASS="Para">Close the compare editor and |
| choose <b>Yes</b> to save the changes. Alternatively you can save the changes |
| by choosing <b>File > Save</b> (Ctrl+S). </p> |
| </li> |
| </ol> |
| |
| |
| <P> |
| <a href="../hglegal2003.htm"><img src="../images/ngibmcpy2003.gif" alt="Copyright IBM Corporation 2000, 2003. All Rights Reserved." border="0" width="324" height="14" ></a> |
| |
| </P> |
| |
| |
| </BODY> |
| </HTML> |
