view help/a-30.html @ 505:1c05e7576ea5

Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes
author Chris Cannam
date Mon, 17 Oct 2011 16:25:02 +0100
parents b3309be1640f
children
line wrap: on
line source
<link rel="stylesheet" type="text/css" href="help.css"/>


<h2>I have committed some changes &ndash; how do I share them with my colleagues?</h2>

<p>There are two common general approaches:</p>

<p><a href="a-31.html">Permit your colleagues to &ldquo;pull&rdquo; your changes</a> directly from the local repository in your working folder, <i>or</i></p>

<p><a href="a-32.html">&ldquo;Push&rdquo; your changes to a shared remote repository</a> which you can all use as a master copy.</p>