comparison templates/guide/index.html @ 436:2b0669fed7a8

update domain to www.mercurial-scm.org

435:b173399d3635

</div>


<div class="note">
<p class="note-title">Note:</p>
<em>identify</em> without options gives you the short form of a unique revision ID. That ID is what Mercurial uses internally. If you tell someone about the version you updated to, you should use that ID, since the numbers can be different for other people. If you want to know the reasons behind that, please read up Mercurials [<a href="http://mercurial.selenic.com/wiki/UnderstandingMercurial">basic concepts</a>]. When you're at the most recent revision, <em>hg identify -n</em> will return "-1".
</div>

<p>To update to the most recent revision, you can use "tip" as revision name.</p>

<pre>$ hg update tip

</pre>

<div class="note">
<p class="note-title">Note:</p>
For more details on resolving conflicts, see the wiki-page <a title="Tutorial - Merging conflicting Changes" href="http://mercurial.selenic.com/wiki/TutorialConflict">TutorialConflict</a>.
</div>


<p>Mark the fixed file as resolved</p>

<div class="note">
<p class="note-title">Note:</p>

If you need empty folders which are available after clone, create a
file in those folders and add that. For details and useful tools, see
the <a href="http://mercurial.selenic.com/wiki/FAQ#FAQ.2FCommonProblems.I_tried_to_check_in_an_empty_directory_and_it_failed.21">empty directory FAQ entry</a>.

</div>

<h5>Rollback mistakes</h5>

<p>With this we can conclude our practical guide.</p>

<h1 id="complex_workflows">More Complex Workflows</h1>

<p>If you now want to check some more complex workflows, please have a look at the general <a title="Mercurial Workflows" href="http://selenic.com/mercurial/wiki/Workflows">workflows wikipage</a> and the list of <a title="Mercurial extensions" href="http://mercurial.selenic.com/wiki/UsingExtensions">extensions</a>.</p>

<p>To deepen your understanding, you can also check the <a title="Overview of the basic concepts of Mercurial" href="http://mercurial.selenic.com/wiki/UnderstandingMercurial">basic concept overview</a>.</p>

<p>Have fun with Mercurial!</p>

436:2b0669fed7a8

</div>


<div class="note">
<p class="note-title">Note:</p>
<em>identify</em> without options gives you the short form of a unique revision ID. That ID is what Mercurial uses internally. If you tell someone about the version you updated to, you should use that ID, since the numbers can be different for other people. If you want to know the reasons behind that, please read up Mercurials [<a href="https://www.mercurial-scm.org/wiki/UnderstandingMercurial">basic concepts</a>]. When you're at the most recent revision, <em>hg identify -n</em> will return "-1".
</div>

<p>To update to the most recent revision, you can use "tip" as revision name.</p>

<pre>$ hg update tip

</pre>

<div class="note">
<p class="note-title">Note:</p>
For more details on resolving conflicts, see the wiki-page <a title="Tutorial - Merging conflicting Changes" href="https://www.mercurial-scm.org/wiki/TutorialConflict">TutorialConflict</a>.
</div>


<p>Mark the fixed file as resolved</p>

<div class="note">
<p class="note-title">Note:</p>

If you need empty folders which are available after clone, create a
file in those folders and add that. For details and useful tools, see
the <a href="https://www.mercurial-scm.org/wiki/FAQ#FAQ.2FCommonProblems.I_tried_to_check_in_an_empty_directory_and_it_failed.21">empty directory FAQ entry</a>.

</div>

<h5>Rollback mistakes</h5>

<p>With this we can conclude our practical guide.</p>

<h1 id="complex_workflows">More Complex Workflows</h1>

<p>If you now want to check some more complex workflows, please have a look at the general <a title="Mercurial Workflows" href="http://selenic.com/mercurial/wiki/Workflows">workflows wikipage</a> and the list of <a title="Mercurial extensions" href="https://www.mercurial-scm.org/wiki/UsingExtensions">extensions</a>.</p>

<p>To deepen your understanding, you can also check the <a title="Overview of the basic concepts of Mercurial" href="https://www.mercurial-scm.org/wiki/UnderstandingMercurial">basic concept overview</a>.</p>

<p>Have fun with Mercurial!</p>