How to use Mercurial?

Jon Ribbens jon-mercurial at unequivocal.co.uk
Fri Apr 9 13:10:31 CDT 2010


On Fri, Apr 09, 2010 at 12:23:51PM -0400, Greg Ward wrote:
> 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.

It doesn't require a clean working directory, I tried it today and it
works fine and seems to do exactly what I want.


More information about the Mercurial mailing list