| <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> |
| <html lang="en"> |
| <head> |
| <meta name="copyright" content= |
| "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> |
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> |
| <meta http-equiv="Content-Style-Type" content="text/css"> |
| <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> |
| <title>Merging changes in the compare editor</title> |
| </head> |
| <body bgcolor="#FFFFFF"> |
| <h1 class="Head">Merging changes in the compare editor</h1> |
| <p>The toolbar buttons in the compare editor 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 All from Left to Right</li> |
| <li>Copy All 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>The <b>Copy All from Left to Right</b> and <b>Copy All from Right to Left</b> actions completely replace the |
| contents of one resource with the other resource.</p> |
| <p>To merge a single change:</p> |
| <ol> |
| <li>Select the highlighted difference that you want to merge.</li> |
| <li>Depending on what you want to do, click either the <b>Copy Current Change from Right to Left</b> or the <b>Copy |
| Current Change from Left to Right</b> toolbar button. The selected text is copied from one file to the other.</li> |
| <li>Right click to get the resource's pop-up menu, and select <b>Save</b>.</li> |
| </ol> |
| <p>The image below gives an example of two files (file1.txt and file2.txt) compared.</p> |
| <p><img src="../images/Image80_compare_editor.png" alt="Compare view" width="715" border="0"></p> |
| <h3 class="related">Related concepts</h3><a href="../concepts/concepts-29.htm">Three way comparisons</a><br> |
| <h3 class="related">Related tasks</h3><a href="tasks-68.htm">Comparing resources</a><br> |
| <a href="tasks-68bg.htm">Understanding the comparison</a><br> |
| <a href="tasks-115.htm">Synchronizing with the repository</a><br> |
| <a href="tasks-113b.htm">Resolving conflicts</a><br> |
| <a href="tasks-68b.htm">Setting preferences for comparing files</a> |
| <h3 class="related">Related reference</h3><a href="../reference/ref-25.htm">Compare editor</a> |
| </body> |
| </html> |
