annotate help/topics.html @ 532:06507a59f2b8 easyhg_v1.1

This will do for the Merge topic

<link rel="stylesheet" type="text/css" href="help.css"/>

<h1>Quick Topics</h1>


<h3>Terminology</h3>
<p><a href="a-04.html">What is a repository?</a></p>
<h3>Opening and initialising things</h3>
<p><a href="a-10.html">Someone gave me a repository URL and asked me to clone it</a></p>
<p><a href="a-11.html">I have a folder of source code or documents on my computer and I want to use version control to manage them</a></p>
<p><a href="a-12.html">I want to start a new project using version control</a></p>
<p><a href="a-13.html">I have a Mercurial repository on my local computer already and I want to use it with EasyMercurial</a></p>
<h3>Making changes</h3>
<p><a href="a-20.html">I've added a new file: what do I do with it?</a></p>
<p><a href="a-21.html">I have changed some files and I want to record the changes</a></p>
<p><a href="a-22.html">I want to remove, rename, or copy a file</a></p>
<p><a href="a-23.html">I just deleted a file using the system file manager &ndash; then remembered I hadn't told the version control tool about it &ndash; what now?</a></p>
<h3>Sharing changes</h3>
<p><a href="a-30.html">I have committed some changes &ndash; how do I share them with my colleagues?</a></p>
<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 &ldquo;the remote repository may have been changed by someone else&rdquo; and refused</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>