Mercurial > hgbook
comparison en/ch02-tour-merge.xml @ 827:d2aacc06e562
Add more paragraph IDs
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sun, 03 May 2009 20:27:28 -0700 |
| parents | a17d6390a480 |
| children | 477d6a3e5023 |
comparison
equal
deleted
inserted
replaced
| 826:a17d6390a480 | 827:d2aacc06e562 |
|---|---|
| 46 linkend="fig:tour-merge:sep-repos"/>. Here is a copy of our | 46 linkend="fig:tour-merge:sep-repos"/>. Here is a copy of our |
| 47 file from one repository.</para> | 47 file from one repository.</para> |
| 48 | 48 |
| 49 &interaction.tour.merge.cat1; | 49 &interaction.tour.merge.cat1; |
| 50 | 50 |
| 51 <para>And here is our slightly different version from the other | 51 <para id="x_722">And here is our slightly different version from the other |
| 52 repository.</para> | 52 repository.</para> |
| 53 | 53 |
| 54 &interaction.tour.merge.cat2; | 54 &interaction.tour.merge.cat2; |
| 55 | 55 |
| 56 <figure id="fig:tour-merge:sep-repos"> | 56 <figure id="fig:tour-merge:sep-repos"> |
| 129 want to do a merge, unless we force it to do so. | 129 want to do a merge, unless we force it to do so. |
| 130 (Incidentally, forcing the update with <command>hg update | 130 (Incidentally, forcing the update with <command>hg update |
| 131 -C</command> would revert any uncommitted changes in the | 131 -C</command> would revert any uncommitted changes in the |
| 132 working directory.)</para> | 132 working directory.)</para> |
| 133 | 133 |
| 134 <para>To start a merge between the two heads, we use the | 134 <para id="x_723">To start a merge between the two heads, we use the |
| 135 <command role="hg-cmd">hg merge</command> command.</para> | 135 <command role="hg-cmd">hg merge</command> command.</para> |
| 136 | 136 |
| 137 &interaction.tour.merge.merge; | 137 &interaction.tour.merge.merge; |
| 138 | 138 |
| 139 <para id="x_347">We resolve the contents of <filename>hello.c</filename> | 139 <para id="x_347">We resolve the contents of <filename>hello.c</filename> |
| 353 &interaction.tour-merge-conflict.commit; | 353 &interaction.tour-merge-conflict.commit; |
| 354 | 354 |
| 355 <note> | 355 <note> |
| 356 <title>Where is the <command>hg resolve</command> command?</title> | 356 <title>Where is the <command>hg resolve</command> command?</title> |
| 357 | 357 |
| 358 <para>The <command>hg resolve</command> command was introduced | 358 <para id="x_724">The <command>hg resolve</command> command was introduced |
| 359 in Mercurial 1.1, which was released in December 2008. If | 359 in Mercurial 1.1, which was released in December 2008. If |
| 360 you are using an older version of Mercurial (run <command>hg | 360 you are using an older version of Mercurial (run <command>hg |
| 361 version</command> to see), this command will not be | 361 version</command> to see), this command will not be |
| 362 present. If your version of Mercurial is older than 1.1, | 362 present. If your version of Mercurial is older than 1.1, |
| 363 you should strongly consider upgrading to a newer version | 363 you should strongly consider upgrading to a newer version |