Chris@531: <link rel="stylesheet" type="text/css" href="help.css"/>
Chris@531: 
Chris@531: 
Chris@532: <h2>How do I use the Merge window?</h2>
Chris@531: 
Chris@531: <p>If you are working with other people on a project, it is likely that
Chris@531: at some point you'll find that more than one of you have edited the
Chris@531: same lines in the same file, in different ways.</p>
Chris@531: 
Chris@531: <p>When that happens and you try to merge the two versions, EasyMercurial
Chris@531: will pop up a merge window that looks a bit like this.</p>
Chris@531: 
Chris@531: <p><center><img src="images/merge50.png"></center></p>
Chris@531: 
Chris@532: <p>(This is actually a separate program, not part of EasyMercurial: it's
Chris@532: a merge tool called kdiff3.)</p>
Chris@531: 
Chris@532: <p>This looks a bit complicated, but it is there to help you pick which
Chris@532: of the changes from each of the two &ldquo;rival&rdquo; versions of the file you
Chris@532: want to use in your merged version.</p>
Chris@532: 
Chris@532: <p> <b>The top middle one is <i>your current version</i>.</b> That's
Chris@532:   the one you had before you decided to merge the other version into
Chris@532:   it.</p>
Chris@532: 
Chris@532: <p> <b>At top right is <i>the version you're merging</i>.</b> That's the other
Chris@532:   rival version &ndash; the one that the other person can see in their copy
Chris@532:   of the repository.</p>
Chris@532: 
Chris@532: <p> <b>At top left is <i>the common ancestor</i>.</b> That's the version that both
Chris@532:   of you had, before you started editing it in different ways.</p>
Chris@532: 
Chris@532: <p> <b>At the bottom is the output.</b></p>
Chris@532: 
Chris@532: <p>Each <i>conflict</i> (a line which you have both changed in different ways)
Chris@532: is shown with <b>Merge Conflict</b> in the output at the bottom.  To sort
Chris@532: out the conflicts and get the right output, you need to go through
Chris@532: them one by one, for each one pressing the A, B, or C button to say
Chris@532: whether for this line you want the top-left, top-middle, or top-right
Chris@532: version to &ldquo;win&rdquo;.  (You can choose more than one, if you want both
Chris@532: versions of a line to appear.)</p>
Chris@532: 
Chris@532: <p>Then having resolved a conflict, press the three-arrows-down toolbar
Chris@532: button to go to the next one &ndash; and when you've done them all, save
Chris@532: and exit.</p>
Chris@532: 
Chris@532: <p>The most important thing to remember is that <i>whatever appears in the
Chris@532: bottom pane is what you'll get as a result</i>.</p>
Chris@532: 
Chris@532: <p>No matter how confusing the process, just remember that if it looks
Chris@532: correct in the bottom pane, it will be correct when you save and
Chris@532: exit. You can even edit the file directly in the bottom pane if you
Chris@532: aren't happy with the way the merge is going.</p>
Chris@532: 
Chris@532: 
Chris@532: 
Chris@532: