How to use Mercurial?

[Greg Ward]

On Thu, Apr 8, 2010 at 10:54 AM, Dirkjan Ochtman <dirkjan at ochtman.nl> wrote:
> Using hg pull --rebase (after enabling the rebase extension) may also
> help here, but you should read up on what rebasing is exactly, first.

Except rebase also requires a clean working directory, for the same
reason as merge: it needs to do file-level merges *somewhere*, and
your working directory is the obvious choice.

Greg