annotate help/a-35.html @ 587:4ed384ea7f39 fswatcher

comment only
author Chris Cannam
date Wed, 14 Mar 2012 12:00:20 +0000
parents 2c106ea908b5
children
rev   line source
Chris@578 1 <link rel="stylesheet" type="text/css" href="help.css"/>
Chris@578 2
Chris@578 3
Chris@578 4 <h2>How do I use the Merge window?</h2>
Chris@578 5
Chris@578 6 <p>If you are working with other people on a project, it is likely that
Chris@578 7 at some point you'll find that more than one of you have edited the
Chris@578 8 same lines in the same file, in different ways.</p>
Chris@578 9
Chris@578 10 <p>When that happens and you try to merge the two versions, EasyMercurial
Chris@578 11 will pop up a merge window that looks a bit like this.</p>
Chris@578 12
Chris@578 13 <p><center><img src="images/merge50.png"></center></p>
Chris@578 14
Chris@578 15 <p>(This is actually a separate program, not part of EasyMercurial: it's
Chris@578 16 a merge tool called kdiff3.)</p>
Chris@578 17
Chris@578 18 <p>This looks a bit complicated, but it is there to help you pick which
Chris@578 19 of the changes from each of the two &ldquo;rival&rdquo; versions of the file you
Chris@578 20 want to use in your merged version.</p>
Chris@578 21
Chris@578 22 <p> <b>The top middle one is <i>your current version</i>.</b> That's
Chris@578 23 the one you had before you decided to merge the other version into
Chris@578 24 it.</p>
Chris@578 25
Chris@578 26 <p> <b>At top right is <i>the version you're merging</i>.</b> That's the other
Chris@578 27 rival version &ndash; the one that the other person can see in their copy
Chris@578 28 of the repository.</p>
Chris@578 29
Chris@578 30 <p> <b>At top left is <i>the common ancestor</i>.</b> That's the version that both
Chris@578 31 of you had, before you started editing it in different ways.</p>
Chris@578 32
Chris@578 33 <p> <b>At the bottom is the output.</b></p>
Chris@578 34
Chris@578 35 <p>Each <i>conflict</i> (a line which you have both changed in different ways)
Chris@578 36 is shown with <b>Merge Conflict</b> in the output at the bottom. To sort
Chris@578 37 out the conflicts and get the right output, you need to go through
Chris@578 38 them one by one, for each one pressing the A, B, or C button to say
Chris@578 39 whether for this line you want the top-left, top-middle, or top-right
Chris@578 40 version to &ldquo;win&rdquo;. (You can choose more than one, if you want both
Chris@578 41 versions of a line to appear.)</p>
Chris@578 42
Chris@578 43 <p>Then having resolved a conflict, press the three-arrows-down toolbar
Chris@578 44 button to go to the next one &ndash; and when you've done them all, save
Chris@578 45 and exit.</p>
Chris@578 46
Chris@578 47 <p>The most important thing to remember is that <i>whatever appears in the
Chris@578 48 bottom pane is what you'll get as a result</i>.</p>
Chris@578 49
Chris@578 50 <p>No matter how confusing the process, just remember that if it looks
Chris@578 51 correct in the bottom pane, it will be correct when you save and
Chris@578 52 exit. You can even edit the file directly in the bottom pane if you
Chris@578 53 aren't happy with the way the merge is going.</p>
Chris@578 54
Chris@578 55
Chris@578 56
Chris@578 57