Mercurial > hg > easyhg
changeset 532:06507a59f2b8 easyhg_v1.1
This will do for the Merge topic
| author | Chris Cannam |
|---|---|
| date | Wed, 23 Nov 2011 17:24:47 +0000 |
| parents | f56e5c39aad1 |
| children | 19bc43bf0843 0d89746bae1a |
| files | help/a-34.html help/topics.html help/topics/34.txt |
| diffstat | 3 files changed, 81 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/help/a-34.html Wed Nov 23 17:03:43 2011 +0000 +++ b/help/a-34.html Wed Nov 23 17:24:47 2011 +0000 @@ -1,7 +1,7 @@ <link rel="stylesheet" type="text/css" href="help.css"/> -<h2>How do I use this Merge window?</h2> +<h2>How do I use the Merge window?</h2> <p>If you are working with other people on a project, it is likely that at some point you'll find that more than one of you have edited the @@ -12,5 +12,46 @@ <p><center><img src="images/merge50.png"></center></p> -<p>(This is actually a separate program, a merge tool called kdiff3.)</p> +<p>(This is actually a separate program, not part of EasyMercurial: it's +a merge tool called kdiff3.)</p> +<p>This looks a bit complicated, but it is there to help you pick which +of the changes from each of the two “rival” versions of the file you +want to use in your merged version.</p> + +<p> <b>The top middle one is <i>your current version</i>.</b> That's + the one you had before you decided to merge the other version into + it.</p> + +<p> <b>At top right is <i>the version you're merging</i>.</b> That's the other + rival version – the one that the other person can see in their copy + of the repository.</p> + +<p> <b>At top left is <i>the common ancestor</i>.</b> That's the version that both + of you had, before you started editing it in different ways.</p> + +<p> <b>At the bottom is the output.</b></p> + +<p>Each <i>conflict</i> (a line which you have both changed in different ways) +is shown with <b>Merge Conflict</b> in the output at the bottom. To sort +out the conflicts and get the right output, you need to go through +them one by one, for each one pressing the A, B, or C button to say +whether for this line you want the top-left, top-middle, or top-right +version to “win”. (You can choose more than one, if you want both +versions of a line to appear.)</p> + +<p>Then having resolved a conflict, press the three-arrows-down toolbar +button to go to the next one – and when you've done them all, save +and exit.</p> + +<p>The most important thing to remember is that <i>whatever appears in the +bottom pane is what you'll get as a result</i>.</p> + +<p>No matter how confusing the process, just remember that if it looks +correct in the bottom pane, it will be correct when you save and +exit. You can even edit the file directly in the bottom pane if you +aren't happy with the way the merge is going.</p> + + + +
--- a/help/topics.html Wed Nov 23 17:03:43 2011 +0000 +++ b/help/topics.html Wed Nov 23 17:24:47 2011 +0000 @@ -20,6 +20,6 @@ <p><a href="a-31.html">I want to let my colleagues pull changes directly from my local repository</a></p> <p><a href="a-32.html">I want to put my changes into a master repository shared with my colleagues</a></p> <p><a href="a-33.html">I tried to push my changes, but it told me “the remote repository may have been changed by someone else” and refused</a></p> -<p><a href="a-34.html">How do I use this Merge window?</a></p> +<p><a href="a-34.html">How do I use the Merge window?</a></p> <h3>See also</h3> <p><a href="a-40.html">Video tutorials</a></p>
--- a/help/topics/34.txt Wed Nov 23 17:03:43 2011 +0000 +++ b/help/topics/34.txt Wed Nov 23 17:24:47 2011 +0000 @@ -11,10 +11,46 @@ #merge50 -(This is actually a separate program, a merge tool called kdiff3.) +(This is actually a separate program, not part of EasyMercurial: it's +a merge tool called kdiff3.) This looks a bit complicated, but it is there to help you pick which of the changes from each of the two "rival" versions of the file you want to use in your merged version. + *The top middle one is _your current version_.* That's + the one you had before you decided to merge the other version into + it. + *At top right is _the version you're merging_.* That's the other + rival version -- the one that the other person can see in their copy + of the repository. + + *At top left is _the common ancestor_.* That's the version that both + of you had, before you started editing it in different ways. + + *At the bottom is the output.* + +Each _conflict_ (a line which you have both changed in different ways) +is shown with *Merge Conflict* in the output at the bottom. To sort +out the conflicts and get the right output, you need to go through +them one by one, for each one pressing the A, B, or C button to say +whether for this line you want the top-left, top-middle, or top-right +version to "win". (You can choose more than one, if you want both +versions of a line to appear.) + +Then having resolved a conflict, press the three-arrows-down toolbar +button to go to the next one -- and when you've done them all, save +and exit. + +The most important thing to remember is that _whatever appears in the +bottom pane is what you'll get as a result_. + +No matter how confusing the process, just remember that if it looks +correct in the bottom pane, it will be correct when you save and +exit. You can even edit the file directly in the bottom pane if you +aren't happy with the way the merge is going. + + + +