You would have to do a hg commit of your local merge first. See hg diff of what has changed. (As far as I know - not a mercurial expert) On Wed, Oct 5, 2011 at 15:32, Timothy Lebo <lebot@rpi.edu> wrote: > > 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 > > -- Stian Soiland-Reyes, myGrid team School of Computer Science The University of ManchesterReceived on Wednesday, 5 October 2011 15:15:10 GMT
This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 13:06:43 GMT