Your IP : 216.73.216.91

Current Path : /usr/lib/beyondcompare/help/
Upload File :
Current File : //usr/lib/beyondcompare/help/dir_merge_understanding_the_display.html

<!DOCTYPE html>
<html>
<head>
   <title>Understanding the Folder Merge Display</title>
   <meta name="generator" content="Help &amp; Manual" />
   <meta name="keywords" content="" />
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
   <link type="text/css" href="default.css" rel="stylesheet" />
   <script type="text/javascript" src="jquery.js"></script>
   <script type="text/javascript" src="helpman_settings.js"></script>
   <script type="text/javascript" src="helpman_topicinit.js"></script>

   <script type="text/javascript">
     HMSyncTOC("index.html", "dir_merge_understanding_the_display.html");
   </script>
   <script type="text/javascript" src="highlight.js"></script>
   <script type="text/javascript">
     $(document).ready(function(){highlight();});
   </script>
</head>
<body style="margin: 0px 0px 0px 0px; background: #FFFFFF;">


<table width="100%" border="0" cellspacing="0" cellpadding="5" 
       style="margin: 0px; background: #9D0909 url(red-bg.jpg) 0px 0px repeat-x;">
<!-- <table width="100%" border="0" cellspacing="0" cellpadding="5" bgcolor="#B01213"> -->
  <tr valign="middle">
<!--    <td style="width: 10px">&nbsp;</td> -->
    <td align="left">
      <h1 class="p_Heading1"><span class="f_Heading1">Understanding the Folder Merge Display</span></h1>

    </td>
    <td align="right">
     <span style="font-size: 9pt">
     <a href="viewdirmerge.html"
        onmouseover="document.images.prev.src='prev-hot.png'" 
        onmouseout="document.images.prev.src='prev.png'"
        ><img name=prev src="prev.png" border=0 alt="Previous"
        ></a><a href="viewdirmerge.html"
        onmouseover="document.images.top.src='top-hot.png'" 
        onmouseout="document.images.top.src='top.png'"><img name=top src="top.png" border=0 alt="Up"
        ></a><a href="viewdirsync.html"
        onmouseover="document.images.next.src='next-hot.png'" 
        onmouseout="document.images.next.src='next.png'"><img name=next src="next.png" border=0 alt="Next"
        ></a>
     </span>
    </td>
  </tr>
</table>


<!-- Placeholder for topic body. -->
<table width="100%" border="0" cellspacing="0" cellpadding="5"><tr valign="top"><td align="left">
<p class="p_Normal">The Folder Merge display uses color cues to highlight the differences between the base folders.  By default, the color meanings are:</p>
<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;"><table style="border:none; border-spacing:0px;">
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:8px; background-color:#808080; padding:0px;"><br />
</td>
<td style="vertical-align:top; width:8px; padding:0px;"><p class="p_SingleSpaced"><span class="f_SingleSpaced">&nbsp;</span></p>
</td>
<td style="vertical-align:top; width:78px; padding:0px;"><p class="p_SingleSpaced">Gray</p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_SingleSpaced">Unknown or older</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:8px; background-color:#000000; padding:0px;"><br />
</td>
<td style="vertical-align:top; width:8px; padding:0px;"><p class="p_SingleSpaced"><span class="f_SingleSpaced">&nbsp;</span></p>
</td>
<td style="vertical-align:top; width:78px; padding:0px;"><p class="p_SingleSpaced">Black</p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_SingleSpaced">Same</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:8px; background-color:#00bfbf; padding:0px;"><br />
</td>
<td style="vertical-align:top; width:8px; padding:0px;"><p class="p_SingleSpaced"><span class="f_SingleSpaced">&nbsp;</span></p>
</td>
<td style="vertical-align:top; width:78px; padding:0px;"><p class="p_SingleSpaced">Teal</p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_SingleSpaced">Left change</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:8px; background-color:#9f00d5; padding:0px;"><br />
</td>
<td style="vertical-align:top; width:8px; padding:0px;"><p class="p_SingleSpaced"><span class="f_SingleSpaced">&nbsp;</span></p>
</td>
<td style="vertical-align:top; width:78px; padding:0px;"><p class="p_SingleSpaced">Magenta</p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_SingleSpaced">Right change</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:8px; background-color:#d56a00; padding:0px;"><br />
</td>
<td style="vertical-align:top; width:8px; padding:0px;"><p class="p_SingleSpaced"><span class="f_SingleSpaced">&nbsp;</span></p>
</td>
<td style="vertical-align:top; width:78px; padding:0px;"><p class="p_SingleSpaced">Orange</p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_SingleSpaced">Mergeable</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:8px; background-color:#ff0000; padding:0px;"><br />
</td>
<td style="vertical-align:top; width:8px; padding:0px;"><p class="p_SingleSpaced"><span class="f_SingleSpaced">&nbsp;</span></p>
</td>
<td style="vertical-align:top; width:78px; padding:0px;"><p class="p_SingleSpaced">Red</p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_SingleSpaced">Conflict</p>
</td>
</tr>
</table>
</div>
<p class="p_Normal">Pick <span class="f_Command">View &gt; Legend</span> to display a guide to the various folder icon color combinations.</p>
<p class="p_Normal">To change the default colors, pick <span class="f_Command">Tools &gt; Options</span> <img width="16" height="16" style="margin:0;width:16px;height:16px;border:none" src="options.png"/>, switch to the <span class="f_Command">Colors, Fonts &gt; Folder Views</span> page, and find the <span class="f_Command">Merge colors</span> settings.</p>
<p class="p_Normal">You can temporarily hide the <span class="f_Command">Center Pane</span> <img width="16" height="16" style="margin:0;width:16px;height:16px;border:none" src="showcenter.png"/> to give the left and right panes more room.</p>
<p class="p_Subtitle"><span class="f_Subtitle">Merge actions</span></p>
<p class="p_Normal">Regardless of merge target:</p>
<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 3px 0px 14px 0px;"><table style="border:none; border-spacing:0px;">
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:36px; padding:0px;"><p class="p_Normal"><img width="28" height="16" style="margin:0;width:28px;height:16px;border:none" src="contentmerged.png"/></p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_Normal">No action required</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:36px; padding:0px;"><p class="p_Normal"><img width="28" height="16" style="margin:0;width:28px;height:16px;border:none" src="contentmergeable.png"/></p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_Normal">Automatic merge</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:36px; padding:0px;"><p class="p_Normal"><img width="28" height="16" style="margin:0;width:28px;height:16px;border:none" src="contentconflict.png"/></p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_Normal">Manual merge required</p>
</td>
</tr>
</table>
</div>
<p class="p_Normal">When merging to left:</p>
<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 3px 0px 14px 0px;"><table style="border:none; border-spacing:0px;">
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:36px; padding:0px;"><p class="p_Normal"><img width="28" height="16" style="margin:0;width:28px;height:16px;border:none" src="contentcopyleft.png"/></p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_Normal">Copy to left</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:36px; padding:0px;"><p class="p_Normal"><img width="28" height="16" style="margin:0;width:28px;height:16px;border:none" src="contentdeleteleft.png"/></p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_Normal">Delete left</p>
</td>
</tr>
</table>
</div>
<p class="p_Normal">When merging to right:</p>
<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 3px 0px 14px 0px;"><table style="border:none; border-spacing:0px;">
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:36px; padding:0px;"><p class="p_Normal"><img width="28" height="16" style="margin:0;width:28px;height:16px;border:none" src="contentcopyright.png"/></p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_Normal">Copy to right</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:36px; padding:0px;"><p class="p_Normal"><img width="28" height="16" style="margin:0;width:28px;height:16px;border:none" src="contentdeleteright.png"/></p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_Normal">Delete right</p>
</td>
</tr>
</table>
</div>
<p class="p_Normal">When merging to other:</p>
<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 3px 0px 14px 0px;"><table style="border:none; border-spacing:0px;">
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:36px; padding:0px;"><p class="p_Normal"><img width="28" height="16" style="margin:0;width:28px;height:16px;border:none" src="contentcopylefttooutput.png"/></p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_Normal">Take left</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:36px; padding:0px;"><p class="p_Normal"><img width="28" height="16" style="margin:0;width:28px;height:16px;border:none" src="contentcopycentertooutput.png"/></p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_Normal">Take center</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:36px; padding:0px;"><p class="p_Normal"><img width="28" height="16" style="margin:0;width:28px;height:16px;border:none" src="contentcopyrighttooutput.png"/></p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_Normal">Take right</p>
</td>
</tr>
<tr style="text-align:left;vertical-align:top;">
<td style="vertical-align:top; width:36px; padding:0px;"><p class="p_Normal"><img width="28" height="16" style="margin:0;width:28px;height:16px;border:none" src="contentdeleteleft.png"/></p>
</td>
<td style="vertical-align:top; padding:0px;"><p class="p_Normal">Delete</p>
</td>
</tr>
</table>
</div>

</td></tr></table>

</body>
</html>