W3C home > Mailing lists > Public > public-prov-wg@w3.org > October 2011

Re: mercurial problem

From: Timothy Lebo <lebot@rpi.edu>
Date: Wed, 5 Oct 2011 10:32:02 -0400
Cc: Provenance Working Group WG <public-prov-wg@w3.org>
Message-Id: <EDF02B8C-F6FB-4109-928F-40CF5F6465CD@rpi.edu>
To: Luc Moreau <L.Moreau@ecs.soton.ac.uk>

On Oct 5, 2011, at 7:29 AM, Luc Moreau wrote:

> 
> sorry for the spam.

x2.


Can anyone recommend how to handle:

bash-3.2$ hg merge tip
abort: outstanding uncommitted merges

hg status hasn't been useful...

Thanks,
Tim


> 
> There  4 heads in the default branch, seemed all to be
> created by Satya editing ontology-related files.
> 
> Cheers,
> Luc
Received on Wednesday, 5 October 2011 14:33:11 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 13:06:43 GMT