annotate help/a-32.html @ 532:06507a59f2b8 easyhg_v1.1

This will do for the Merge topic

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


<h2>I want to put my changes into a master repository shared with my colleagues</h2>

<p>Setting up such a repository with a properly configured remote server
is out of the scope of this Help, but you generally want one of the
following:</p>

<p><b>A server that everyone on your team has secure ssh access to</b>, <i>or</i></p>

<p><b>An account with a managed online Mercurial hosting service</b></p>

<p>With either of the above, you should be able to create a new
repository on the server and obtain a Mercurial URL for it.  That may
be a <i>ssh://host/path</i> URL in the former case, or the URL (often an
<i>https</i> one) provided by the service in the latter case.</p>

<p>In EasyMercurial, you then:</p>

<p><b>1. Go to Remote -> Set Remote Location.., enter the URL of the remote repository and click OK.</b>
<ul><li>This tells EasyMercurial to use that URL as the default location for subsequent push and pull operations.</li></ul></p>

<p><b>2. Click Push on the main toolbar at the top of the EasyMercurial window.</b></p>

<p>This will push all of the changes that you have made in your local
repository (since you pushed to the same target, if you ever have).
You should do this regularly whenever you have a coherent set of
changes for others to use or test.  Your colleagues can then pull from
the same remote repository URL to obtain your changes.</p>

<p>For this to work, the target repository must be <i>related</i> to the local
one.  That means either a repository that has been pulled to, or
pushed to from, the local repository before; or the repository that
was initially used to clone the local one from; or else an empty
repository.</p>