commit your changes or stash them before you can merge - I didn't change anything :-(

[Pierre Abbat]

On Thursday 20 May 2010 06:57:44 Siju George wrote:
> error: Your local changes to 'lib/libc/uuid/uuid_name_lookup.c' would
> be overwritten by merge.  Aborting.
> Please, commit your changes or stash them before you can merge.

I've gotten that when updating the source after applying a kernel patch. I 
just deleted the patched file.

Pierre

-- 
When a barnacle settles down, its brain disintegrates.
Já não percebe nada, já não percebe nada.