comparison templates/guide/index.html @ 420:934061e0f672

note: link to FAQ instead of giving *nixy command.

419:19a6c35d52ff

You also have to commit after a merge when there are no conflicts, because merging creates new history and you might want to attach a specific message to the merge (like "merge feature1").
</div>


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

If you need empty folders which are available after clone, add
a <code>.keep</code> file in the folder and add that.

<pre>$ mkdir emptyfolder
$ touch emptyfolder/.keep
$ hg add emptyfolder/.keep
$ hg commit -m "ensure that emptyfolder is available." emptyfolder/.keep

</pre>

To create <code>.keep</code> files for every empty folder, you can use
the following command:

<pre>$ find . -type d -empty -exec touch {}/.keep \;

</pre>

</div>

<h5>Rollback mistakes</h5>

420:934061e0f672

You also have to commit after a merge when there are no conflicts, because merging creates new history and you might want to attach a specific message to the merge (like "merge feature1").
</div>


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

If you need empty folders which are available after clone, create a
file in the 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>